From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 20 Feb 2013 02:14:29 +0000 (+1100)
Subject: acpi-memory-hotplug-support-getting-hotplug-info-from-srat-fix
X-Git-Tag: next-20130220~1^2~496
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c0d6762d395782dd1308dcd4a16b019de3f9bad6;p=karo-tx-linux.git

acpi-memory-hotplug-support-getting-hotplug-info-from-srat-fix

mm/page_alloc.c: In function 'cmdline_parse_movablemem_map':
mm/page_alloc.c:5372: warning: comparison of distinct pointer types lacks a cast

not the right fix, but I'm tired of the warning

Cc: Tang Chen <tangchen@cn.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index f21a586442f7..8571e4c17489 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5317,7 +5317,7 @@ static int __init cmdline_parse_movablemem_map(char *p)
 	if (!p)
 		goto err;
 
-	if (!strncmp(p, "acpi", max(4, strlen(p))))
+	if (!strncmp(p, "acpi", max_t(size_t, 4, strlen(p))))
 		movablemem_map.acpi = true;
 
 	/*