From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 7 Feb 2013 01:26:54 +0000 (+1100)
Subject: page-writebackc-subtract-min_free_kbytes-from-dirtyable-memory-fix-fix
X-Git-Tag: next-20130218~1^2~368
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=858e7fde1e623ec76be41d6876f520e7cae658fc;p=karo-tx-linux.git

page-writebackc-subtract-min_free_kbytes-from-dirtyable-memory-fix-fix

fix min() warning

Cc: Paul Szabo <psz@maths.usyd.edu.au>
Cc: Rik van Riel <riel@redhat.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 227a655c27dc..650ebd0505f7 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -242,7 +242,7 @@ static unsigned long global_dirtyable_memory(void)
 		x -= highmem_dirtyable_memory(x);
 
 	/* Subtract min_free_kbytes */
-	x -= min(x, min_free_kbytes >> (PAGE_SHIFT - 10));
+	x -= min_t(unsigned long, x, min_free_kbytes >> (PAGE_SHIFT - 10));
 
 	return x + 1;	/* Ensure that we never return 0 */
 }