[PATCH 14/31] proc: move /proc/cpuinfo code to fs/proc/cpuinfo.c

From: Alexey Dobriyan
Date: Sat Oct 04 2008 - 15:40:23 EST


Signed-off-by: Alexey Dobriyan <adobriyan@xxxxxxxxx>
---
fs/proc/Makefile | 1 +
fs/proc/cpuinfo.c | 24 ++++++++++++++++++++++++
fs/proc/proc_misc.c | 14 --------------
3 files changed, 25 insertions(+), 14 deletions(-)
create mode 100644 fs/proc/cpuinfo.c

diff --git a/fs/proc/Makefile b/fs/proc/Makefile
index f24ebfd..c91cc9c 100644
--- 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
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 8018979..916ed4d 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -93,19 +93,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);
@@ -534,7 +521,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
--
1.5.6.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/