aboutsummaryrefslogtreecommitdiffstats
path: root/fs/proc/proc_misc.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/proc/proc_misc.c')
-rw-r--r--fs/proc/proc_misc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c
index 48cb35862445..eae66b41a1a4 100644
--- a/fs/proc/proc_misc.c
+++ b/fs/proc/proc_misc.c
@@ -120,7 +120,6 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
120{ 120{
121 struct sysinfo i; 121 struct sysinfo i;
122 int len; 122 int len;
123 struct page_state ps;
124 unsigned long inactive; 123 unsigned long inactive;
125 unsigned long active; 124 unsigned long active;
126 unsigned long free; 125 unsigned long free;
@@ -129,7 +128,6 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
129 struct vmalloc_info vmi; 128 struct vmalloc_info vmi;
130 long cached; 129 long cached;
131 130
132 get_page_state(&ps);
133 get_zone_counts(&active, &inactive, &free); 131 get_zone_counts(&active, &inactive, &free);
134 132
135/* 133/*
@@ -172,6 +170,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
172 "Mapped: %8lu kB\n" 170 "Mapped: %8lu kB\n"
173 "Slab: %8lu kB\n" 171 "Slab: %8lu kB\n"
174 "PageTables: %8lu kB\n" 172 "PageTables: %8lu kB\n"
173 "NFS Unstable: %8lu kB\n"
175 "CommitLimit: %8lu kB\n" 174 "CommitLimit: %8lu kB\n"
176 "Committed_AS: %8lu kB\n" 175 "Committed_AS: %8lu kB\n"
177 "VmallocTotal: %8lu kB\n" 176 "VmallocTotal: %8lu kB\n"
@@ -196,6 +195,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
196 K(global_page_state(NR_FILE_MAPPED)), 195 K(global_page_state(NR_FILE_MAPPED)),
197 K(global_page_state(NR_SLAB)), 196 K(global_page_state(NR_SLAB)),
198 K(global_page_state(NR_PAGETABLE)), 197 K(global_page_state(NR_PAGETABLE)),
198 K(global_page_state(NR_UNSTABLE_NFS)),
199 K(allowed), 199 K(allowed),
200 K(committed), 200 K(committed),
201 (unsigned long)VMALLOC_TOTAL >> 10, 201 (unsigned long)VMALLOC_TOTAL >> 10,