aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/proc/proc_misc.c12
-rw-r--r--include/linux/vmstat.h1
-rw-r--r--mm/vmstat.c14
3 files changed, 13 insertions, 14 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 900331a634ef..e7a301d5d432 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -69,17 +69,6 @@ static const struct file_operations proc_zoneinfo_file_operations = {
69 .release = seq_release, 69 .release = seq_release,
70}; 70};
71 71
72static int vmstat_open(struct inode *inode, struct file *file)
73{
74 return seq_open(file, &vmstat_op);
75}
76static const struct file_operations proc_vmstat_file_operations = {
77 .open = vmstat_open,
78 .read = seq_read,
79 .llseek = seq_lseek,
80 .release = seq_release,
81};
82
83#ifdef CONFIG_BLOCK 72#ifdef CONFIG_BLOCK
84static int diskstats_open(struct inode *inode, struct file *file) 73static int diskstats_open(struct inode *inode, struct file *file)
85{ 74{
@@ -245,7 +234,6 @@ void __init proc_misc_init(void)
245 proc_symlink("mounts", NULL, "self/mounts"); 234 proc_symlink("mounts", NULL, "self/mounts");
246 235
247 /* And now for trickier ones */ 236 /* And now for trickier ones */
248 proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
249 proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations); 237 proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
250#ifdef CONFIG_BLOCK 238#ifdef CONFIG_BLOCK
251 proc_create("diskstats", 0, NULL, &proc_diskstats_operations); 239 proc_create("diskstats", 0, NULL, &proc_diskstats_operations);
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h
index 33ffd89a88ac..7b68c4c1e19c 100644
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h
@@ -55,7 +55,6 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,
55}; 55};
56 56
57extern const struct seq_operations zoneinfo_op; 57extern const struct seq_operations zoneinfo_op;
58extern const struct seq_operations vmstat_op;
59extern int sysctl_stat_interval; 58extern int sysctl_stat_interval;
60 59
61#ifdef CONFIG_VM_EVENT_COUNTERS 60#ifdef CONFIG_VM_EVENT_COUNTERS
diff --git a/mm/vmstat.c b/mm/vmstat.c
index d624d251946d..7e1854b81868 100644
--- a/mm/vmstat.c
+++ b/mm/vmstat.c
@@ -858,13 +858,24 @@ static void vmstat_stop(struct seq_file *m, void *arg)
858 m->private = NULL; 858 m->private = NULL;
859} 859}
860 860
861const struct seq_operations vmstat_op = { 861static const struct seq_operations vmstat_op = {
862 .start = vmstat_start, 862 .start = vmstat_start,
863 .next = vmstat_next, 863 .next = vmstat_next,
864 .stop = vmstat_stop, 864 .stop = vmstat_stop,
865 .show = vmstat_show, 865 .show = vmstat_show,
866}; 866};
867 867
868static int vmstat_open(struct inode *inode, struct file *file)
869{
870 return seq_open(file, &vmstat_op);
871}
872
873static const struct file_operations proc_vmstat_file_operations = {
874 .open = vmstat_open,
875 .read = seq_read,
876 .llseek = seq_lseek,
877 .release = seq_release,
878};
868#endif /* CONFIG_PROC_FS */ 879#endif /* CONFIG_PROC_FS */
869 880
870#ifdef CONFIG_SMP 881#ifdef CONFIG_SMP
@@ -938,6 +949,7 @@ static int __init setup_vmstat(void)
938#ifdef CONFIG_PROC_FS 949#ifdef CONFIG_PROC_FS
939 proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations); 950 proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
940 proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops); 951 proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
952 proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
941#endif 953#endif
942 return 0; 954 return 0;
943} 955}