Commit d7a3e495 authored by Hugh Dickins's avatar Hugh Dickins Committed by Linus Torvalds

mm: ifdef Quicklists in /proc/meminfo

A "Quicklists:          0 kB" line has just started appearing in
/proc/meminfo, but most architectures (including x86) don't have
them configured, so #ifdef it, like the highmem lines.

And those architectures which do have quicklists configured are
using them for page tables: so let's place it next to PageTables.
Signed-off-by: default avatarHugh Dickins <hugh@veritas.com>
Acked-by: default avatarChristoph Lameter <cl@linux-foundation.org>
Acked-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1558182f
...@@ -183,6 +183,9 @@ static int meminfo_read_proc(char *page, char **start, off_t off, ...@@ -183,6 +183,9 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
"SReclaimable: %8lu kB\n" "SReclaimable: %8lu kB\n"
"SUnreclaim: %8lu kB\n" "SUnreclaim: %8lu kB\n"
"PageTables: %8lu kB\n" "PageTables: %8lu kB\n"
#ifdef CONFIG_QUICKLIST
"Quicklists: %8lu kB\n"
#endif
"NFS_Unstable: %8lu kB\n" "NFS_Unstable: %8lu kB\n"
"Bounce: %8lu kB\n" "Bounce: %8lu kB\n"
"WritebackTmp: %8lu kB\n" "WritebackTmp: %8lu kB\n"
...@@ -190,8 +193,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off, ...@@ -190,8 +193,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
"Committed_AS: %8lu kB\n" "Committed_AS: %8lu kB\n"
"VmallocTotal: %8lu kB\n" "VmallocTotal: %8lu kB\n"
"VmallocUsed: %8lu kB\n" "VmallocUsed: %8lu kB\n"
"VmallocChunk: %8lu kB\n" "VmallocChunk: %8lu kB\n",
"Quicklists: %8lu kB\n",
K(i.totalram), K(i.totalram),
K(i.freeram), K(i.freeram),
K(i.bufferram), K(i.bufferram),
...@@ -216,6 +218,9 @@ static int meminfo_read_proc(char *page, char **start, off_t off, ...@@ -216,6 +218,9 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
K(global_page_state(NR_SLAB_RECLAIMABLE)), K(global_page_state(NR_SLAB_RECLAIMABLE)),
K(global_page_state(NR_SLAB_UNRECLAIMABLE)), K(global_page_state(NR_SLAB_UNRECLAIMABLE)),
K(global_page_state(NR_PAGETABLE)), K(global_page_state(NR_PAGETABLE)),
#ifdef CONFIG_QUICKLIST
K(quicklist_total_size()),
#endif
K(global_page_state(NR_UNSTABLE_NFS)), K(global_page_state(NR_UNSTABLE_NFS)),
K(global_page_state(NR_BOUNCE)), K(global_page_state(NR_BOUNCE)),
K(global_page_state(NR_WRITEBACK_TEMP)), K(global_page_state(NR_WRITEBACK_TEMP)),
...@@ -223,8 +228,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off, ...@@ -223,8 +228,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
K(committed), K(committed),
(unsigned long)VMALLOC_TOTAL >> 10, (unsigned long)VMALLOC_TOTAL >> 10,
vmi.used >> 10, vmi.used >> 10,
vmi.largest_chunk >> 10, vmi.largest_chunk >> 10
K(quicklist_total_size())
); );
len += hugetlb_report_meminfo(page + len); len += hugetlb_report_meminfo(page + len);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment