summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Gortmaker <paul.gortmaker@windriver.com>2014-01-21 15:48:46 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-01-21 16:19:42 -0800
commitaf52b040eba5e6982d8665af8cd4dd69a466d5c3 (patch)
treefa49ba5b9fbb3fba315e481f5df0422962f3aa1f
parentb5bd856a0c2a6331ee3300fb589aeea56eba110b (diff)
downloadlinux-af52b040eba5e6982d8665af8cd4dd69a466d5c3.tar.gz
linux-af52b040eba5e6982d8665af8cd4dd69a466d5c3.tar.bz2
linux-af52b040eba5e6982d8665af8cd4dd69a466d5c3.zip
fs/ramfs: don't use module_init for non-modular core code
The ramfs is always built in. 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 a worse thing. 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 this registration 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 the 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>
-rw-r--r--fs/ramfs/inode.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c
index 39d14659a8d3..6a3e2c420180 100644
--- a/fs/ramfs/inode.c
+++ b/fs/ramfs/inode.c
@@ -275,4 +275,4 @@ int __init init_ramfs_fs(void)
return err;
}
-module_init(init_ramfs_fs)
+fs_initcall(init_ramfs_fs);