From b460cbd79c1bec4e44c0fb59aed6e59a93f21e13 Mon Sep 17 00:00:00 2001 From: Claudio Scordino Date: Thu, 8 Dec 2011 14:33:56 -0800 Subject: [PATCH] --- yaml --- r: 276534 b: refs/heads/master c: b53fc7c2974a50913f49e1d800fe904a28c338e3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/proc/meminfo.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index dd61eca4e200..696aea96ba90 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83aeeada7c69f35e5100b27ec354335597a7a488 +refs/heads/master: b53fc7c2974a50913f49e1d800fe904a28c338e3 diff --git a/trunk/fs/proc/meminfo.c b/trunk/fs/proc/meminfo.c index 586174168e2a..80e4645f7990 100644 --- a/trunk/fs/proc/meminfo.c +++ b/trunk/fs/proc/meminfo.c @@ -131,12 +131,13 @@ static int meminfo_proc_show(struct seq_file *m, void *v) K(i.freeswap), K(global_page_state(NR_FILE_DIRTY)), K(global_page_state(NR_WRITEBACK)), - K(global_page_state(NR_ANON_PAGES) #ifdef CONFIG_TRANSPARENT_HUGEPAGE + K(global_page_state(NR_ANON_PAGES) + global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) * - HPAGE_PMD_NR + HPAGE_PMD_NR), +#else + K(global_page_state(NR_ANON_PAGES)), #endif - ), K(global_page_state(NR_FILE_MAPPED)), K(global_page_state(NR_SHMEM)), K(global_page_state(NR_SLAB_RECLAIMABLE) +