diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-23 19:58:30 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-23 19:58:30 -0700 |
| commit | 24a81a2c258177ba334838a372651f784953b03a (patch) | |
| tree | 6c3ea896b8a690ed43def034f3f5b885069397b4 /include/linux/module.h | |
| parent | 91c17449fe04adfb12ff9523f62e9cd0d658a88d (diff) | |
| parent | 520eccdfe187591a51ea9ab4c1a024ae4d0f68d9 (diff) | |
Merge 4.13-rc2 into char-misc-next
We want the char/misc driver fixes in here as well to handle future
changes.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 8eb9a1e693e5..e7bdd549e527 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -45,7 +45,7 @@ struct module_kobject { struct kobject *drivers_dir; struct module_param_attrs *mp; struct completion *kobj_completion; -}; +} __randomize_layout; struct module_attribute { struct attribute attr; @@ -475,7 +475,7 @@ struct module { ctor_fn_t *ctors; unsigned int num_ctors; #endif -} ____cacheline_aligned; +} ____cacheline_aligned __randomize_layout; #ifndef MODULE_ARCH_INIT #define MODULE_ARCH_INIT {} #endif |