From 858e7fde1e623ec76be41d6876f520e7cae658fc Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Thu, 7 Feb 2013 12:26:54 +1100 Subject: [PATCH] page-writebackc-subtract-min_free_kbytes-from-dirtyable-memory-fix-fix fix min() warning Cc: Paul Szabo Cc: Rik van Riel Cc: Wu Fengguang Signed-off-by: Andrew Morton --- mm/page-writeback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 */ } -- 2.39.5