Skip to content

Commit

Permalink
proc: move /proc/cpuinfo code to fs/proc/cpuinfo.c
Browse files Browse the repository at this point in the history
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
  • Loading branch information
Alexey Dobriyan committed Oct 23, 2008
1 parent fe25104 commit 8591cf4
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 14 deletions.
1 change: 1 addition & 0 deletions fs/proc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
24 changes: 24 additions & 0 deletions fs/proc/cpuinfo.c
Original file line number Diff line number Diff line change
@@ -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);
14 changes: 0 additions & 14 deletions fs/proc/proc_misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 8591cf4

Please sign in to comment.