aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Boyd <bebarino@gmail.com>2011-07-25 17:13:12 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-07-25 20:57:15 -0700
commit626a0312514a121a90b4478cbde111ffc6826ae2 (patch)
tree18524e3f4ea38576459da3d29323bc2268b7d282
parenta376d3d6727b2f05ef4c6670cc74afbd8110df89 (diff)
downloadautogen-626a0312514a121a90b4478cbde111ffc6826ae2.tar.gz
autogen-626a0312514a121a90b4478cbde111ffc6826ae2.tar.xz
autogen-626a0312514a121a90b4478cbde111ffc6826ae2.zip
kernel/configs.c: include MODULE_*() when CONFIG_IKCONFIG_PROC=n
If CONFIG_IKCONFIG=m but CONFIG_IKCONFIG_PROC=n we get a module that has no MODULE_LICENSE definition. Move the MODULE_*() definitions outside the CONFIG_IKCONFIG_PROC #ifdef to prevent this configuration from tainting the kernel. Signed-off-by: Stephen Boyd <bebarino@gmail.com> Acked-by: Randy Dunlap <rdunlap@xenotime.net> Acked-by: WANG Cong <xiyou.wangcong@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--kernel/configs.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/configs.c b/kernel/configs.c
index b4066b44a99..42e8fa075ee 100644
--- a/kernel/configs.c
+++ b/kernel/configs.c
@@ -92,8 +92,8 @@ static void __exit ikconfig_cleanup(void)
module_init(ikconfig_init);
module_exit(ikconfig_cleanup);
+#endif /* CONFIG_IKCONFIG_PROC */
+
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Randy Dunlap");
MODULE_DESCRIPTION("Echo the kernel .config file used to build the kernel");
-
-#endif /* CONFIG_IKCONFIG_PROC */