diff options
| author | Mark Brown <broonie@kernel.org> | 2015-06-09 18:35:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-06-09 18:35:46 +0100 |
| commit | 6724af486903df57338c14424e02599e371cf563 (patch) | |
| tree | 0e42ae32bbfe7e93ba9db11a1124aeb4378cbd71 /include/linux/module.h | |
| parent | d2233325e5b7891914901867ca5355347d59df14 (diff) | |
| parent | 9deef024a12ebae4965c89837f662905ac88944b (diff) | |
Merge branch 'fix/fsl-dspi' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-fsl-dspi
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 42999fe2dbd0..c883b86ea964 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -338,12 +338,18 @@ struct module { #ifdef CONFIG_EVENT_TRACING struct ftrace_event_call **trace_events; unsigned int num_trace_events; + struct trace_enum_map **trace_enums; + unsigned int num_trace_enums; #endif #ifdef CONFIG_FTRACE_MCOUNT_RECORD unsigned int num_ftrace_callsites; 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; |