proc: move /proc/cpuinfo code to fs/proc/cpuinfo.c

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>

diff --git a/fs/proc/Makefile b/fs/proc/Makefile
index f24ebfdc5b4fb659df3232327d3707a4e39bad9a..c91cc9c283bd2fdcc977a1cd9a826c1dbe4a8fec 100644 (file)
--- a/fs/proc/Makefile
+++ b/fs/proc/Makefile
@@ -10,6 +10,7 @@ proc-$(CONFIG_MMU)    := mmu.o task_mmu.o
 proc-y       += inode.o root.o base.o generic.o array.o \
                proc_tty.o proc_misc.o
 proc-y += cmdline.o
+proc-y += cpuinfo.o
 proc-y += devices.o
 proc-y += loadavg.o
 proc-y += meminfo.o

diff --git a/fs/proc/cpuinfo.c b/fs/proc/cpuinfo.c
new file mode 100644 (file)
index 0000000..5a1e539
--- /dev/null
+++ b/fs/proc/cpuinfo.c
@@ -0,0 +1,24 @@
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
+
+extern const struct seq_operations cpuinfo_op;
+static int cpuinfo_open(struct inode *inode, struct file *file)
+{
+       return seq_open(file, &cpuinfo_op);
+}
+
+static const struct file_operations proc_cpuinfo_operations = {
+       .open           = cpuinfo_open,
+       .read           = seq_read,
+       .llseek         = seq_lseek,
+       .release        = seq_release,
+};
+
+static int __init proc_cpuinfo_init(void)
+{
+       proc_create("cpuinfo", 0, NULL, &proc_cpuinfo_operations);
+       return 0;
+}
+module_init(proc_cpuinfo_init);

diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index a6fadc0cc4b0d6701116ce22778e5b12e76407a6..8974809be5f6f00db276df84d1fd525073a96b73 100644 (file)
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -94,19 +94,6 @@ static const struct file_operations proc_zoneinfo_file_operations = {
        .release        = seq_release,
 };
 
-extern const struct seq_operations cpuinfo_op;
-static int cpuinfo_open(struct inode *inode, struct file *file)
-{
-       return seq_open(file, &cpuinfo_op);
-}
-
-static const struct file_operations proc_cpuinfo_operations = {
-       .open           = cpuinfo_open,
-       .read           = seq_read,
-       .llseek         = seq_lseek,
-       .release        = seq_release,
-};
-
 static int vmstat_open(struct inode *inode, struct file *file)
 {
        return seq_open(file, &vmstat_op);
@@ -532,7 +519,6 @@ void __init proc_misc_init(void)
        proc_symlink("mounts", NULL, "self/mounts");
 
        /* And now for trickier ones */
-       proc_create("cpuinfo", 0, NULL, &proc_cpuinfo_operations);
 #ifdef CONFIG_BLOCK
        proc_create("partitions", 0, NULL, &proc_partitions_operations);
 #endif