diff options
Diffstat (limited to 'fs/proc/proc_misc.c')
| -rw-r--r-- | fs/proc/proc_misc.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/fs/proc/proc_misc.c b/fs/proc/proc_misc.c index 00f10a2dcf12..29e20c6b1f7f 100644 --- a/fs/proc/proc_misc.c +++ b/fs/proc/proc_misc.c | |||
| @@ -183,6 +183,9 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
| 183 | "SReclaimable: %8lu kB\n" | 183 | "SReclaimable: %8lu kB\n" |
| 184 | "SUnreclaim: %8lu kB\n" | 184 | "SUnreclaim: %8lu kB\n" |
| 185 | "PageTables: %8lu kB\n" | 185 | "PageTables: %8lu kB\n" |
| 186 | #ifdef CONFIG_QUICKLIST | ||
| 187 | "Quicklists: %8lu kB\n" | ||
| 188 | #endif | ||
| 186 | "NFS_Unstable: %8lu kB\n" | 189 | "NFS_Unstable: %8lu kB\n" |
| 187 | "Bounce: %8lu kB\n" | 190 | "Bounce: %8lu kB\n" |
| 188 | "WritebackTmp: %8lu kB\n" | 191 | "WritebackTmp: %8lu kB\n" |
| @@ -190,8 +193,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
| 190 | "Committed_AS: %8lu kB\n" | 193 | "Committed_AS: %8lu kB\n" |
| 191 | "VmallocTotal: %8lu kB\n" | 194 | "VmallocTotal: %8lu kB\n" |
| 192 | "VmallocUsed: %8lu kB\n" | 195 | "VmallocUsed: %8lu kB\n" |
| 193 | "VmallocChunk: %8lu kB\n" | 196 | "VmallocChunk: %8lu kB\n", |
| 194 | "Quicklists: %8lu kB\n", | ||
| 195 | K(i.totalram), | 197 | K(i.totalram), |
| 196 | K(i.freeram), | 198 | K(i.freeram), |
| 197 | K(i.bufferram), | 199 | K(i.bufferram), |
| @@ -216,6 +218,9 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
| 216 | K(global_page_state(NR_SLAB_RECLAIMABLE)), | 218 | K(global_page_state(NR_SLAB_RECLAIMABLE)), |
| 217 | K(global_page_state(NR_SLAB_UNRECLAIMABLE)), | 219 | K(global_page_state(NR_SLAB_UNRECLAIMABLE)), |
| 218 | K(global_page_state(NR_PAGETABLE)), | 220 | K(global_page_state(NR_PAGETABLE)), |
| 221 | #ifdef CONFIG_QUICKLIST | ||
| 222 | K(quicklist_total_size()), | ||
| 223 | #endif | ||
| 219 | K(global_page_state(NR_UNSTABLE_NFS)), | 224 | K(global_page_state(NR_UNSTABLE_NFS)), |
| 220 | K(global_page_state(NR_BOUNCE)), | 225 | K(global_page_state(NR_BOUNCE)), |
| 221 | K(global_page_state(NR_WRITEBACK_TEMP)), | 226 | K(global_page_state(NR_WRITEBACK_TEMP)), |
| @@ -223,8 +228,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off, | |||
| 223 | K(committed), | 228 | K(committed), |
| 224 | (unsigned long)VMALLOC_TOTAL >> 10, | 229 | (unsigned long)VMALLOC_TOTAL >> 10, |
| 225 | vmi.used >> 10, | 230 | vmi.used >> 10, |
| 226 | vmi.largest_chunk >> 10, | 231 | vmi.largest_chunk >> 10 |
| 227 | K(quicklist_total_size()) | ||
| 228 | ); | 232 | ); |
| 229 | 233 | ||
| 230 | len += hugetlb_report_meminfo(page + len); | 234 | len += hugetlb_report_meminfo(page + len); |
