Commit ad8f5797 authored May 20, 2006 by KAMEZAWA Hiroyuki Committed by Linus Torvalds May 21, 2006

[PATCH] build fix: CONFIG_MEMORY_HOTPLUG=y on i386

typo in #ifdefs.  Fixes http://bugme.osdl.org/show_bug.cgi?id=6538



Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent d4e9dc63

arch/i386/mm/init.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -651,7 +651,7 @@ void __init mem_init(void)
		* Specifically, in the case of x86, we will always add
		* memory to the highmem for now.
		*/
		#ifdef CONFIG_HOTPLUG_MEMORY
		#ifdef CONFIG_MEMORY_HOTPLUG
		#ifndef CONFIG_NEED_MULTIPLE_NODES
		int add_memory(u64 start, u64 size)
		{