From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 30 Nov 2011 04:11:32 +0000 (+1100)
Subject: mm-exclude-reserved-pages-from-dirtyable-memory-fix
X-Git-Tag: next-20111130~3^2~106
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0f58ea1f08856d698e0022d93b582db980f3cb77;p=karo-tx-linux.git

mm-exclude-reserved-pages-from-dirtyable-memory-fix

fix highmem build

Cc: Chris Mason <chris.mason@oracle.com>
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Dave Chinner <david@fromorbit.com>
Cc: Jan Kara <jack@suse.cz>
Cc: Johannes Weiner <jweiner@redhat.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Michal Hocko <mhocko@suse.cz>
Cc: Minchan Kim <minchan.kim@gmail.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Shaohua Li <shaohua.li@intel.com>
Cc: Wu Fengguang <fengguang.wu@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index bce2bd62e564..a56e15c059fe 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -157,8 +157,7 @@ static unsigned long highmem_dirtyable_memory(unsigned long total)
 			&NODE_DATA(node)->node_zones[ZONE_HIGHMEM];
 
 		x += zone_page_state(z, NR_FREE_PAGES) +
-		     zone_reclaimable_pages(z) -
-		     zone->dirty_balance_reserve;
+		     zone_reclaimable_pages(z) - z->dirty_balance_reserve;
 	}
 	/*
 	 * Make sure that the number of highmem pages is never larger