projects/linux·commit bf33cbdf

proc: move proc_console.c to fs/proc/consoles.c

bf33cbdf · Alexey Dobriyan <[email protected]> · 2011-01-12 17:00:36 -08:00

Filename is supposed to match procfile name for random junk.

Add __init while I'm at it.

Signed-off-by: Alexey Dobriyan <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
bf33cbdf8acccf96de268fbfb347d94e72de81ef
Parents
3740a20c

Changes

2 files changed · +3 −3

FileStatusAddDelContent
fs/proc/Makefilemodified+1−1View file
fs/proc/proc_console.c → fs/proc/consoles.crenamed+2−2View file

fs/proc/Makefile

View file
diff --git a/fs/proc/Makefile b/fs/proc/Makefile
index 288a49e..df434c5 100644
--- a/fs/proc/Makefile
+++ b/fs/proc/Makefile
@@ -10,12 +10,12 @@ proc-$(CONFIG_MMU) := mmu.o task_mmu.o
proc-y += inode.o root.o base.o generic.o array.o \
proc_tty.o
proc-y += cmdline.o
+proc-y += consoles.o
proc-y += cpuinfo.o
proc-y += devices.o
proc-y += interrupts.o
proc-y += loadavg.o
proc-y += meminfo.o
-proc-y += proc_console.o
proc-y += stat.o
proc-y += uptime.o
proc-y += version.o

fs/proc/consoles.c

View file
diff --git a/fs/proc/proc_console.c b/fs/proc/consoles.c
similarity index 97%
rename from fs/proc/proc_console.c
rename to fs/proc/consoles.c
index 8a70760..eafc22a 100644
--- a/fs/proc/proc_console.c
+++ b/fs/proc/consoles.c
@@ -106,9 +106,9 @@ static const struct file_operations proc_consoles_operations = {
.release = seq_release,
};
-static int register_proc_consoles(void)
+static int __init proc_consoles_init(void)
{
proc_create("consoles", 0, NULL, &proc_consoles_operations);
return 0;
}
-module_init(register_proc_consoles);
+module_init(proc_consoles_init);