From: Gary Hade <garyhade@us.ibm.com>
Date: Tue, 28 Oct 2008 23:43:14 +0000 (-0700)
Subject: x86: remove debug code from arch_add_memory()
X-Git-Tag: v2.6.27.9~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b9d4b7312803c55d8c8c616334b38eae7852904a;p=thirdparty%2Fkernel%2Fstable.git

x86: remove debug code from arch_add_memory()

commit fe8b868eccb9f85a0e231e35f0abac5b39bac801 upstream.

Impact: remove incorrect WARN_ON(1)

Gets rid of dmesg spam created during physical memory hot-add which
will very likely confuse users.  The change removes what appears to
be debugging code which I assume was unintentionally included in:

  x86: arch/x86/mm/init_64.c printk fixes
  commit 10f22dde556d1ed41d55355d1fb8ad495f9810c8

Signed-off-by: Gary Hade <garyhade@us.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
index 25a44c7b57e90..1adbb3eb9b7e6 100644
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -726,7 +726,7 @@ int arch_add_memory(int nid, u64 start, u64 size)
 		max_pfn_mapped = last_mapped_pfn;
 
 	ret = __add_pages(zone, start_pfn, nr_pages);
-	WARN_ON(1);
+	WARN_ON_ONCE(ret);
 
 	return ret;
 }