diff options
| author | Mark Brown <broonie@kernel.org> | 2015-03-26 17:50:42 -0700 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-03-26 17:50:42 -0700 |
| commit | 1be38e041f8eaa935f370aa0f34dd7a2fe39b1d8 (patch) | |
| tree | 2d89734fc831593784bd411be03a1b9649de4c9d /include/linux/module.h | |
| parent | 6935224da2482a261c786501fbccb1dc4a675225 (diff) | |
| parent | bc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff) | |
Merge tag 'v4.0-rc5' into spi-bcm2835
Linux 4.0-rc5
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; |