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>

diff --git a/kernel/hung_task.c b/kernel/hung_task.c
index 0b9c169d577f967ab04750d32d2639a5e7d2bc6f..06bb1417b063fe52e287554f6c343b95cb239b55 100644 (file)
--- a/kernel/hung_task.c
+++ b/kernel/hung_task.c
@@ -246,5 +246,4 @@ static int __init hung_task_init(void)
 
        return 0;
 }
-
-module_init(hung_task_init);
+subsys_initcall(hung_task_init);

diff --git a/kernel/kexec.c b/kernel/kexec.c
index 45601cf41bee0106ff37a7ef5112cfd065c4a7bc..c0d261c7db7b8d418c148d7a177b07c3a304ea0d 100644 (file)
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -1235,7 +1235,7 @@ static int __init crash_notes_memory_init(void)
        }
        return 0;
 }
-module_init(crash_notes_memory_init)
+subsys_initcall(crash_notes_memory_init);
 
 
 /*
@@ -1629,7 +1629,7 @@ static int __init crash_save_vmcoreinfo_init(void)
        return 0;
 }
 
-module_init(crash_save_vmcoreinfo_init)
+subsys_initcall(crash_save_vmcoreinfo_init);
 
 /*
  * Move into place and start executing a preloaded standalone

diff --git a/kernel/profile.c b/kernel/profile.c
index ebdd9c1a86b4dfd7840df57c64f13f72a1401156..1b266dbe755a983e0bca02bb50ca1ab47419488d 100644 (file)
--- a/kernel/profile.c
+++ b/kernel/profile.c
@@ -604,5 +604,5 @@ int __ref create_proc_profile(void) /* false positive from hotcpu_notifier */
        hotcpu_notifier(profile_cpu_callback, 0);
        return 0;
 }
-module_init(create_proc_profile);
+subsys_initcall(create_proc_profile);
 #endif /* CONFIG_PROC_FS */

diff --git a/kernel/sched/stats.c b/kernel/sched/stats.c
index da98af347e8b6ed212e67086ae8576628c11d0dd..a476bea17fbc663974a07fa4521e6b590071fbef 100644 (file)
--- a/kernel/sched/stats.c
+++ b/kernel/sched/stats.c
@@ -142,4 +142,4 @@ static int __init proc_schedstat_init(void)
        proc_create("schedstat", 0, NULL, &proc_schedstat_operations);
        return 0;
 }
-module_init(proc_schedstat_init);
+subsys_initcall(proc_schedstat_init);

diff --git a/kernel/user.c b/kernel/user.c
index c006131beb77c5151f92cacb9e11e6a3b1defe1b..294fc6a9416845f7d5aa2b2d2029fe1b95bcbdbd 100644 (file)
--- a/kernel/user.c
+++ b/kernel/user.c
@@ -222,5 +222,4 @@ static int __init uid_cache_init(void)
 
        return 0;
 }
-
-module_init(uid_cache_init);
+subsys_initcall(uid_cache_init);

diff --git a/kernel/user_namespace.c b/kernel/user_namespace.c
index dd06439b9c84fe80463121905339c41493710998..0d8f6023fd8dc16e615bd4c1f7e5bf43fe8eec78 100644 (file)
--- a/kernel/user_namespace.c
+++ b/kernel/user_namespace.c
@@ -902,4 +902,4 @@ static __init int user_namespaces_init(void)
        user_ns_cachep = KMEM_CACHE(user_namespace, SLAB_PANIC);
        return 0;
 }
-module_init(user_namespaces_init);
+subsys_initcall(user_namespaces_init);