aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/kexec.c
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2014-04-03 17:48:35 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-04-03 19:21:07 -0400
commitc96d6660dc65b0a90aea9834bfd8be1d5656da18 (patch)
tree7cc860d2d176138f10a5836a712e932f8187bacf /kernel/kexec.c
parentd300d59ca179fd1de427cde2a96eb2871347491f (diff)
kernel: audit/fix non-modular users of module_init in core code
Code that is obj-y (always built-in) or dependent on a bool Kconfig (built-in or absent) can never be modular. So using module_init as an alias for __initcall can be somewhat misleading. Fix these up now, so that we can relocate module_init from init.h into module.h in the future. If we don't do this, we'd have to add module.h to obviously non-modular code, and that would be a worse thing. The audit targets the following module_init users for change: kernel/user.c obj-y kernel/kexec.c bool KEXEC (one instance per arch) kernel/profile.c bool PROFILING kernel/hung_task.c bool DETECT_HUNG_TASK kernel/sched/stats.c bool SCHEDSTATS kernel/user_namespace.c bool USER_NS Note that direct use of __initcall is discouraged, vs. one of the priority categorized subgroups. As __initcall gets mapped onto device_initcall, our use of subsys_initcall (which makes sense for these files) will thus change this registration from level 6-device to level 4-subsys (i.e. slightly earlier). However no observable impact of that difference has been observed during testing. Also, two instances of missing ";" at EOL are fixed in kexec. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Eric Biederman <ebiederm@xmission.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/kexec.c')
-rw-r--r--kernel/kexec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c
index 45601cf41bee..c0d261c7db7b 100644
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -1235,7 +1235,7 @@ static int __init crash_notes_memory_init(void)
1235 } 1235 }
1236 return 0; 1236 return 0;
1237} 1237}
1238module_init(crash_notes_memory_init) 1238subsys_initcall(crash_notes_memory_init);
1239 1239
1240 1240
1241/* 1241/*
@@ -1629,7 +1629,7 @@ static int __init crash_save_vmcoreinfo_init(void)
1629 return 0; 1629 return 0;
1630} 1630}
1631 1631
1632module_init(crash_save_vmcoreinfo_init) 1632subsys_initcall(crash_save_vmcoreinfo_init);
1633 1633
1634/* 1634/*
1635 * Move into place and start executing a preloaded standalone 1635 * Move into place and start executing a preloaded standalone