projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d4e9dc6
)
[PATCH] build fix: CONFIG_MEMORY_HOTPLUG=y on i386
author
KAMEZAWA Hiroyuki
<kamezawa.hiroyu@jp.fujitsu.com>
Sat, 20 May 2006 22:00:03 +0000
(15:00 -0700)
committer
Linus Torvalds
<torvalds@g5.osdl.org>
Sun, 21 May 2006 19:59:17 +0000
(12:59 -0700)
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>
arch/i386/mm/init.c
patch
|
blob
|
history
diff --git
a/arch/i386/mm/init.c
b/arch/i386/mm/init.c
index ae6534ad816113d40b05cc514e2626adf26a5de6..3df1371d4520bb39a8346f6a26326dbce9f589ec 100644
(file)
--- a/
arch/i386/mm/init.c
+++ b/
arch/i386/mm/init.c
@@
-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)
{