fs/proc: don't use module_init for non-modular core code (abaf3787) · Commits · 戴 / test

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. Signed-off-by:

Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

fs/proc/cmdline.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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);

Admin message