diff options
| author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-04 23:40:23 +0400 |
|---|---|---|
| committer | Alexey Dobriyan <adobriyan@gmail.com> | 2008-10-23 15:05:11 +0400 |
| commit | 8591cf43224980a0bc9216a4e50b0a740f8cba35 (patch) | |
| tree | f3af8c5a36528b961c95354662c38a5f06d406aa | |
| parent | fe2510426a02dd2fefcb0389b60f77cbe0462289 (diff) | |
proc: move /proc/cpuinfo code to fs/proc/cpuinfo.c
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
| -rw-r--r-- | fs/proc/Makefile | 1 | ||||
| -rw-r--r-- | fs/proc/cpuinfo.c | 24 | ||||
| -rw-r--r-- | fs/proc/proc_misc.c | 14 |
3 files changed, 25 insertions, 14 deletions
diff --git a/fs/proc/Makefile b/fs/proc/Makefile index f24ebfdc5b4..c91cc9c283b 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 00000000000..5a1e539a234 --- /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 a6fadc0cc4b..8974809be5f 100644 --- 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 |