diff options
author | KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com> | 2009-09-21 20:01:29 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-22 10:17:26 -0400 |
commit | 3701b0332330ca1add3e5d56513ef201ff7efdbb (patch) | |
tree | a4b47de49b0ebb763f35c3984168a9075cba6052 /mm/page_alloc.c | |
parent | b904dcfed6967e9cfc8a54778498f6d289420309 (diff) |
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: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Reviewed-by: Minchan Kim <minchan.kim@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/page_alloc.c')
-rw-r--r-- | mm/page_alloc.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 91ae36c30330..bdf12f36bae0 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c | |||
@@ -2138,7 +2138,8 @@ void show_free_areas(void) | |||
2138 | " inactive_file:%lu" | 2138 | " inactive_file:%lu" |
2139 | " unevictable:%lu" | 2139 | " unevictable:%lu" |
2140 | " dirty:%lu writeback:%lu unstable:%lu\n" | 2140 | " dirty:%lu writeback:%lu unstable:%lu\n" |
2141 | " free:%lu slab:%lu mapped:%lu pagetables:%lu bounce:%lu\n", | 2141 | " free:%lu slab_reclaimable:%lu slab_unreclaimable:%lu\n" |
2142 | " mapped:%lu pagetables:%lu bounce:%lu\n", | ||
2142 | global_page_state(NR_ACTIVE_ANON), | 2143 | global_page_state(NR_ACTIVE_ANON), |
2143 | global_page_state(NR_ACTIVE_FILE), | 2144 | global_page_state(NR_ACTIVE_FILE), |
2144 | global_page_state(NR_INACTIVE_ANON), | 2145 | global_page_state(NR_INACTIVE_ANON), |
@@ -2148,8 +2149,8 @@ void show_free_areas(void) | |||
2148 | global_page_state(NR_WRITEBACK), | 2149 | global_page_state(NR_WRITEBACK), |
2149 | global_page_state(NR_UNSTABLE_NFS), | 2150 | global_page_state(NR_UNSTABLE_NFS), |
2150 | global_page_state(NR_FREE_PAGES), | 2151 | global_page_state(NR_FREE_PAGES), |
2151 | global_page_state(NR_SLAB_RECLAIMABLE) + | 2152 | global_page_state(NR_SLAB_RECLAIMABLE), |
2152 | global_page_state(NR_SLAB_UNRECLAIMABLE), | 2153 | global_page_state(NR_SLAB_UNRECLAIMABLE), |
2153 | global_page_state(NR_FILE_MAPPED), | 2154 | global_page_state(NR_FILE_MAPPED), |
2154 | global_page_state(NR_PAGETABLE), | 2155 | global_page_state(NR_PAGETABLE), |
2155 | global_page_state(NR_BOUNCE)); | 2156 | global_page_state(NR_BOUNCE)); |