diff options
author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2014-01-24 00:55:45 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-24 01:37:02 +0100 |
commit | abaf3787ac26ba33e2f75e76b1174c32254c25b0 (patch) | |
tree | 4ee0428fc9038c62125c775d0cb8be946a9de842 /fs/proc/loadavg.c | |
parent | fs/proc_namespace.c: simplify testing nsp and nsp->mnt_ns (diff) | |
download | linux-abaf3787ac26ba33e2f75e76b1174c32254c25b0.tar.xz linux-abaf3787ac26ba33e2f75e76b1174c32254c25b0.zip |
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>
Diffstat (limited to 'fs/proc/loadavg.c')
-rw-r--r-- | fs/proc/loadavg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/loadavg.c b/fs/proc/loadavg.c index 1afa4dd4cae2..aec66e6c2060 100644 --- 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); |