| Date | Thu, 11 Dec 2008 11:16:24 -0800 | From | Greg KH <> | Subject | [patch 70/83] x86: remove debug code from arch_add_memory() |
| |
2.6.27-stable review patch. If anyone has any objections, please let us know.
------------------
From: Gary Hade <garyhade@us.ibm.com>
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>
--- arch/x86/mm/init_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
--- 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, max_pfn_mapped = last_mapped_pfn; ret = __add_pages(zone, start_pfn, nr_pages); - WARN_ON(1); + WARN_ON_ONCE(ret); return ret; }
|