]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit - fs/proc/devices.c
fs/proc: don't use module_init for non-modular core code
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Thu, 23 Jan 2014 23:55:45 +0000 (15:55 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 24 Jan 2014 00:37:02 +0000 (16:37 -0800)
commitabaf3787ac26ba33e2f75e76b1174c32254c25b0
tree4ee0428fc9038c62125c775d0cb8be946a9de842
parent3d93116cef306bd516a7645e7b4895d1d0ceec2b
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>
16 files changed:
fs/proc/cmdline.c
fs/proc/consoles.c
fs/proc/cpuinfo.c
fs/proc/devices.c
fs/proc/interrupts.c
fs/proc/kcore.c
fs/proc/kmsg.c
fs/proc/loadavg.c
fs/proc/meminfo.c
fs/proc/nommu.c
fs/proc/page.c
fs/proc/softirqs.c
fs/proc/stat.c
fs/proc/uptime.c
fs/proc/version.c
fs/proc/vmcore.c