fs/proc: don't use module_init for non-modular core code
Subsystems (4)
PATCH 1/1 fs/proc: don't use module_init for non-modular core code
PROC_FS is a bool, so this code is either present or absent. It will never be modular, so using module_init as an alias for __initcall is rather misleading.
Fix this 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 ugly at best.
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 fs_initcall (which makes sense for fs code) will thus change these registrations from level 6-device to level 5-fs (i.e. slightly earlier). However no observable impact of that small difference has been observed during testing, or is expected.
Also note that this change uncovers a missing semicolon bug in the registration of vmcore_init as an initcall.
fs/proc/cmdline.c +1 -1
@@ -26,4 +26,4 @@ static int __init proc_cmdline_init(void)proc_create ("cmdline" ,0 ,NULL , &cmdline_proc_fops);return 0 ; } -module_init (proc_cmdline_init); +fs_initcall (proc_cmdline_init);
fs/proc/consoles.c +1 -1
@@ -109,4 +109,4 @@ static int __init proc_consoles_init(void)proc_create ("consoles" ,0 ,NULL , &proc_consoles_operations);return 0 ; } -module_init (proc_consoles_init); +fs_initcall (proc_consoles_init);
fs/proc/cpuinfo.c +1 -1
@@ -21,4 +21,4 @@ static int __init proc_cpuinfo_init(void)proc_create ("cpuinfo" ,0 ,NULL , &proc_cpuinfo_operations);return 0 ; } -module_init (proc_cpuinfo_init); +fs_initcall (proc_cpuinfo_init);
fs/proc/devices.c +1 -1
@@ -67,4 +67,4 @@ static int __init proc_devices_init(void)proc_create ("devices" ,0 ,NULL , &proc_devinfo_operations);return 0 ; } -module_init (proc_devices_init); +fs_initcall (proc_devices_init);
fs/proc/interrupts.c +1 -1
@@ -50,4 +50,4 @@ static int __init proc_interrupts_init(void)proc_create ("interrupts" ,0 ,NULL , &proc_interrupts_operations);return 0 ; } -module_init (proc_interrupts_init); +fs_initcall (proc_interrupts_init);
fs/proc/kcore.c +1 -1
@@ -639,4 +639,4 @@ static int __init proc_kcore_init(void)return 0 ; } -module_init (proc_kcore_init); +fs_initcall (proc_kcore_init);
fs/proc/kmsg.c +1 -1
@@ -61,4 +61,4 @@ static int __init proc_kmsg_init(void)proc_create ("kmsg" ,S_IRUSR ,NULL , &proc_kmsg_operations);return 0 ; } -module_init (proc_kmsg_init); +fs_initcall (proc_kmsg_init);
fs/proc/loadavg.c +1 -1
@@ -42,4 +42,4 @@ static int __init proc_loadavg_init(void)proc_create ("loadavg" ,0 ,NULL , &loadavg_proc_fops);return 0 ; } -module_init (proc_loadavg_init); +fs_initcall (proc_loadavg_init);
fs/proc/meminfo.c +1 -1
@@ -220,4 +220,4 @@ static int __init proc_meminfo_init(void)proc_create ("meminfo" ,0 ,NULL , &meminfo_proc_fops);return 0 ; } -module_init (proc_meminfo_init); +fs_initcall (proc_meminfo_init);
fs/proc/nommu.c +1 -1
@@ -131,4 +131,4 @@ static int __init proc_nommu_init(void)return 0 ; } -module_init (proc_nommu_init); +fs_initcall (proc_nommu_init);
fs/proc/page.c +1 -1
@@ -219,4 +219,4 @@ static int __init proc_page_init(void)proc_create ("kpageflags" ,S_IRUSR ,NULL , &proc_kpageflags_operations);return 0 ; } -module_init (proc_page_init); +fs_initcall (proc_page_init);
fs/proc/softirqs.c +1 -1
@@ -41,4 +41,4 @@ static int __init proc_softirqs_init(void)proc_create ("softirqs" ,0 ,NULL , &proc_softirqs_operations);return 0 ; } -module_init (proc_softirqs_init); +fs_initcall (proc_softirqs_init);
fs/proc/stat.c +1 -1
@@ -221,4 +221,4 @@ static int __init proc_stat_init(void)proc_create ("stat" ,0 ,NULL , &proc_stat_operations);return 0 ; } -module_init (proc_stat_init); +fs_initcall (proc_stat_init);
fs/proc/uptime.c +1 -1
@@ -49,4 +49,4 @@ static int __init proc_uptime_init(void)proc_create ("uptime" ,0 ,NULL , &uptime_proc_fops);return 0 ; } -module_init (proc_uptime_init); +fs_initcall (proc_uptime_init);
fs/proc/version.c +1 -1
@@ -31,4 +31,4 @@ static int __init proc_version_init(void)proc_create ("version" ,0 ,NULL , &version_proc_fops);return 0 ; } -module_init (proc_version_init); +fs_initcall (proc_version_init);
fs/proc/vmcore.c +1 -1
@@ -1082,7 +1082,7 @@ static int __init vmcore_init(void) proc_vmcore->size = vmcore_size;return 0 ; } -module_init (vmcore_init) +fs_initcall (vmcore_init);/* Cleanup function for vmcore module. */ void vmcore_cleanup (void )
Signature · 1 line
1.8.5.2