From: Andrew Morton <akpm@linux-foundation.org>
Date: Thu, 7 Feb 2013 01:26:40 +0000 (+1100)
Subject: acpi-memory-hotplug-support-getting-hotplug-info-from-srat-fix
X-Git-Tag: next-20130218~1^2~409
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=c76cf5570b806eca5cb41e1ca5c87f42f815620b;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 ada77963e44b..be23c161ac19 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5314,7 +5314,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;
 
 	/*