Skip to content

Commit b2c96d9

Browse files
Paul Gortmakersfrothwell
Paul Gortmaker
authored andcommitted
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>
1 parent 788645e commit b2c96d9

File tree

6 files changed

+7
-9
lines changed

6 files changed

+7
-9
lines changed

Diff for: kernel/hung_task.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -244,5 +244,4 @@ static int __init hung_task_init(void)
244244

245245
return 0;
246246
}
247-
248-
module_init(hung_task_init);
247+
subsys_initcall(hung_task_init);

Diff for: kernel/kexec.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -1234,7 +1234,7 @@ static int __init crash_notes_memory_init(void)
12341234
}
12351235
return 0;
12361236
}
1237-
module_init(crash_notes_memory_init)
1237+
subsys_initcall(crash_notes_memory_init);
12381238

12391239

12401240
/*
@@ -1628,7 +1628,7 @@ static int __init crash_save_vmcoreinfo_init(void)
16281628
return 0;
16291629
}
16301630

1631-
module_init(crash_save_vmcoreinfo_init)
1631+
subsys_initcall(crash_save_vmcoreinfo_init);
16321632

16331633
/*
16341634
* Move into place and start executing a preloaded standalone

Diff for: kernel/profile.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -604,5 +604,5 @@ int __ref create_proc_profile(void) /* false positive from hotcpu_notifier */
604604
hotcpu_notifier(profile_cpu_callback, 0);
605605
return 0;
606606
}
607-
module_init(create_proc_profile);
607+
subsys_initcall(create_proc_profile);
608608
#endif /* CONFIG_PROC_FS */

Diff for: kernel/sched/stats.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,4 +142,4 @@ static int __init proc_schedstat_init(void)
142142
proc_create("schedstat", 0, NULL, &proc_schedstat_operations);
143143
return 0;
144144
}
145-
module_init(proc_schedstat_init);
145+
subsys_initcall(proc_schedstat_init);

Diff for: kernel/user.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -222,5 +222,4 @@ static int __init uid_cache_init(void)
222222

223223
return 0;
224224
}
225-
226-
module_init(uid_cache_init);
225+
subsys_initcall(uid_cache_init);

Diff for: kernel/user_namespace.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -902,4 +902,4 @@ static __init int user_namespaces_init(void)
902902
user_ns_cachep = KMEM_CACHE(user_namespace, SLAB_PANIC);
903903
return 0;
904904
}
905-
module_init(user_namespaces_init);
905+
subsys_initcall(user_namespaces_init);

0 commit comments

Comments
 (0)