diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-22 20:08:33 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-22 20:08:33 -0500 |
commit | 6ef192f2259e78e1870c509fbd3040e6752b3b9c (patch) | |
tree | 61530c9059819327e82e72c70a8b1ee4c3559b47 /include/linux/module.h | |
parent | 37c85961c3f87f2141c84e53df31e59db072fd2e (diff) | |
parent | 0d4ec7849f5a197d46c062a49f47ed326dd0388c (diff) |
Merge tag 'modules-for-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux
Pull modules updates from Jessica Yu:
"Summary of modules changes for the 4.11 merge window:
- A few small code cleanups
- Add modules git tree url to MAINTAINERS"
* tag 'modules-for-v4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
MAINTAINERS: add tree for modules
module: fix memory leak on early load_module() failures
module: Optimize search_module_extables()
modules: mark __inittest/__exittest as __maybe_unused
livepatch/module: print notice of TAINT_LIVEPATCH
module: Drop redundant declaration of struct module
Diffstat (limited to 'include/linux/module.h')
-rw-r--r-- | include/linux/module.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index f4f542ed3d92..0297c5cd7cdf 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
@@ -126,13 +126,13 @@ extern void cleanup_module(void); | |||
126 | 126 | ||
127 | /* Each module must use one module_init(). */ | 127 | /* Each module must use one module_init(). */ |
128 | #define module_init(initfn) \ | 128 | #define module_init(initfn) \ |
129 | static inline initcall_t __inittest(void) \ | 129 | static inline initcall_t __maybe_unused __inittest(void) \ |
130 | { return initfn; } \ | 130 | { return initfn; } \ |
131 | int init_module(void) __attribute__((alias(#initfn))); | 131 | int init_module(void) __attribute__((alias(#initfn))); |
132 | 132 | ||
133 | /* This is only required if you want to be unloadable. */ | 133 | /* This is only required if you want to be unloadable. */ |
134 | #define module_exit(exitfn) \ | 134 | #define module_exit(exitfn) \ |
135 | static inline exitcall_t __exittest(void) \ | 135 | static inline exitcall_t __maybe_unused __exittest(void) \ |
136 | { return exitfn; } \ | 136 | { return exitfn; } \ |
137 | void cleanup_module(void) __attribute__((alias(#exitfn))); | 137 | void cleanup_module(void) __attribute__((alias(#exitfn))); |
138 | 138 | ||
@@ -281,8 +281,6 @@ enum module_state { | |||
281 | MODULE_STATE_UNFORMED, /* Still setting it up. */ | 281 | MODULE_STATE_UNFORMED, /* Still setting it up. */ |
282 | }; | 282 | }; |
283 | 283 | ||
284 | struct module; | ||
285 | |||
286 | struct mod_tree_node { | 284 | struct mod_tree_node { |
287 | struct module *mod; | 285 | struct module *mod; |
288 | struct latch_tree_node node; | 286 | struct latch_tree_node node; |