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.

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>

diff --git a/fs/proc/cmdline.c b/fs/proc/cmdline.c
index 82676e3fcd1d096c74a9b5bca2f7f29335b336be..cbd82dff7e81aeecadacb219ba96ec01ae4f5202 100644 (file)
--- a/fs/proc/cmdline.c
+++ b/fs/proc/cmdline.c
@@ -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);

diff --git a/fs/proc/consoles.c b/fs/proc/consoles.c
index 51942d5abcecb43d8a081fefa830a97f52d05b76..290ba85cb9002e7f0e9d6dd21dbbdbc4dd56e006 100644 (file)
--- a/fs/proc/consoles.c
+++ b/fs/proc/consoles.c
@@ -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);

diff --git a/fs/proc/cpuinfo.c b/fs/proc/cpuinfo.c
index 5a1e539a234bf3b55eda8a1d183537cc70bf03d8..06f4d31e0396dfe4d2187c1a70f62aa8401e1d0e 100644 (file)
--- a/fs/proc/cpuinfo.c
+++ b/fs/proc/cpuinfo.c
@@ -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);

diff --git a/fs/proc/devices.c b/fs/proc/devices.c
index b14347167c35a49ea2e55a219bc4f298ea156458..50493edc30e56e157a6f37407cce84ff60a05de2 100644 (file)
--- a/fs/proc/devices.c
+++ b/fs/proc/devices.c
@@ -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);

diff --git a/fs/proc/interrupts.c b/fs/proc/interrupts.c
index 05029c0e2f2479d072cb3402ea965d361b1dbb35..a352d5703b4196112c9e581905ef467f28d4f133 100644 (file)
--- a/fs/proc/interrupts.c
+++ b/fs/proc/interrupts.c
@@ -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);

diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c
index 5ed0e52d6aa02bcd4e4867bd1cd36f8633f9f2f1..39e6ef32f0bd6a3483f8771606a88801eb56ccc6 100644 (file)
--- a/fs/proc/kcore.c
+++ b/fs/proc/kcore.c
@@ -639,4 +639,4 @@ static int __init proc_kcore_init(void)
 
        return 0;
 }
-module_init(proc_kcore_init);
+fs_initcall(proc_kcore_init);

diff --git a/fs/proc/kmsg.c b/fs/proc/kmsg.c
index bdfabdaefdceab967df948cd3509a39990d3fe8b..05f8dcdb086e4a2fd44e7077fbc6f98b8d9608a2 100644 (file)
--- a/fs/proc/kmsg.c
+++ b/fs/proc/kmsg.c
@@ -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);

diff --git a/fs/proc/loadavg.c b/fs/proc/loadavg.c
index 1afa4dd4cae24167a0c4e3f47137a13cf8a6d199..aec66e6c2060b8f1a3f24bfb44a90d48f5bb5af2 100644 (file)
--- a/fs/proc/loadavg.c
+++ b/fs/proc/loadavg.c
@@ -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);

diff --git a/fs/proc/meminfo.c b/fs/proc/meminfo.c
index 24270eceddbff0e4a7d0ca1e4aad8a669510771e..136e548d9567feafaa6a695abf8dd3a9015c5a87 100644 (file)
--- a/fs/proc/meminfo.c
+++ b/fs/proc/meminfo.c
@@ -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);

diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c
index 5f9bc8a746c93dbfa99678b9a7d91c2a0999fdf9..d4a35746cab91f8967dc83b7466fd572a77ae8d4 100644 (file)
--- a/fs/proc/nommu.c
+++ b/fs/proc/nommu.c
@@ -131,4 +131,4 @@ static int __init proc_nommu_init(void)
        return 0;
 }
 
-module_init(proc_nommu_init);
+fs_initcall(proc_nommu_init);

diff --git a/fs/proc/page.c b/fs/proc/page.c
index cab84b6272ed3d812b3e876d444722d1815a66ce..02174a610315ebb218880a8744e05b2244b6d26f 100644 (file)
--- a/fs/proc/page.c
+++ b/fs/proc/page.c
@@ -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);

diff --git a/fs/proc/softirqs.c b/fs/proc/softirqs.c
index 62604be9f58d61ef6b9c4cf5b8f787e214d8dc78..ad8a77f94beb0210311b1f8d2af0cbeee6093201 100644 (file)
--- a/fs/proc/softirqs.c
+++ b/fs/proc/softirqs.c
@@ -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);

diff --git a/fs/proc/stat.c b/fs/proc/stat.c
index 1cf86c0e868930585d0058b7943cc047367802f3..6f599c62f0cc939ce2b68a75dbcd38d366ee7fa9 100644 (file)
--- a/fs/proc/stat.c
+++ b/fs/proc/stat.c
@@ -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);

diff --git a/fs/proc/uptime.c b/fs/proc/uptime.c
index 061894625903ded399f2ab9285daa5f69adba854..7141b8d0ca9ed9800afb1ae87def5f8aa06b8f46 100644 (file)
--- a/fs/proc/uptime.c
+++ b/fs/proc/uptime.c
@@ -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);

diff --git a/fs/proc/version.c b/fs/proc/version.c
index 76817a60678c35c599f8416232bf75df52dffd91..d2154eb6d78faa593ed72ee176eadb89d7df3f4c 100644 (file)
--- a/fs/proc/version.c
+++ b/fs/proc/version.c
@@ -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);

diff --git a/fs/proc/vmcore.c b/fs/proc/vmcore.c
index 9100d695988690e0ae7e3263ad2502aa43d94e8c..2ca7ba047f04b658028e1e8c9cd9f5ba746d9946 100644 (file)
--- a/fs/proc/vmcore.c
+++ b/fs/proc/vmcore.c
@@ -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)