diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-18 20:46:39 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-03-18 20:46:39 +0300 |
| commit | da11508eb0b00740c7b05290d80d3f38618af4e8 (patch) | |
| tree | e970834609500f9fb7ba4ce288b7bc387ab101a0 /include/linux/module.h | |
| parent | e63c733d03070d4d3aaf3a29775b42fa9ab95bbf (diff) | |
| parent | 8cb2c2dc472775479a1a7e78180955f6f1cb0b0a (diff) | |
| download | linux-da11508eb0b00740c7b05290d80d3f38618af4e8.tar.xz | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching
Pull livepatching fix from Jiri Kosina:
- fix for potential race with module loading, from Petr Mladek.
The race is very unlikely to be seen in real world and has been found
by code inspection, but should be fixed for 4.0 anyway.
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
livepatch: Fix subtle race with coming and going modules
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 42999fe2dbd0..b03485bcb82a 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -344,6 +344,10 @@ struct module { unsigned long *ftrace_callsites; #endif +#ifdef CONFIG_LIVEPATCH + bool klp_alive; +#endif + #ifdef CONFIG_MODULE_UNLOAD /* What modules depend on me? */ struct list_head source_list; |