Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3701b033 authored by KOSAKI Motohiro's avatar KOSAKI Motohiro Committed by Linus Torvalds
Browse files

mm: show_free_areas(): display slab pages in two separate fields 



If an OOM happens, we really want to know the number of remaining
reclaimable pages.  So the reclaimable slab and unreclaimable slab fields
should not be combined for display.

Signed-off-by: default avatarKOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reviewed-by: default avatarMinchan Kim <minchan.kim@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b904dcfe

mm/page_alloc.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -2138,7 +2138,8 @@ void show_free_areas(void) 
		" inactive_file:%lu"

		" inactive_file:%lu"

		" unevictable:%lu"

		" unevictable:%lu"

		" dirty:%lu writeback:%lu unstable:%lu\n"

		" dirty:%lu writeback:%lu unstable:%lu\n"

		" free:%lu slab:%lu mapped:%lu pagetables:%lu bounce:%lu\n",

		" free:%lu slab_reclaimable:%lu slab_unreclaimable:%lu\n"

		" mapped:%lu pagetables:%lu bounce:%lu\n",

		global_page_state(NR_ACTIVE_ANON),

		global_page_state(NR_ACTIVE_ANON),

		global_page_state(NR_ACTIVE_FILE),

		global_page_state(NR_ACTIVE_FILE),

		global_page_state(NR_INACTIVE_ANON),

		global_page_state(NR_INACTIVE_ANON),
@@ -2148,7 +2149,7 @@ void show_free_areas(void) 
		global_page_state(NR_WRITEBACK),

		global_page_state(NR_WRITEBACK),

		global_page_state(NR_UNSTABLE_NFS),

		global_page_state(NR_UNSTABLE_NFS),

		global_page_state(NR_FREE_PAGES),

		global_page_state(NR_FREE_PAGES),

		global_page_state(NR_SLAB_RECLAIMABLE) +

		global_page_state(NR_SLAB_RECLAIMABLE),

		global_page_state(NR_SLAB_UNRECLAIMABLE),

		global_page_state(NR_SLAB_UNRECLAIMABLE),

		global_page_state(NR_FILE_MAPPED),

		global_page_state(NR_FILE_MAPPED),

		global_page_state(NR_PAGETABLE),

		global_page_state(NR_PAGETABLE),