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 227a655c27dcb5bbc62d9231ad10a48dd64ea4da..650ebd0505f7b5ea3cf34265ddff113f47d41a6b 100644 (file)
--- 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 */
 }