diff options
| author |   Yasunori Goto <y-goto@jp.fujitsu.com> | 2006-12-22 01:11:13 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-22 08:55:50 -0800 |
| commit | 7c7e9425f114a109b07be2c2c1c6c169e34e9bb3 (patch) | |
| tree | 9b530791da2e7683d80f779492347fff148d16b2 /arch/i386/mm/init.c | |
| parent | [PATCH] mips: if_fddi.h: Add a missing inclusion (diff) | |
| download | linux-dev-7c7e9425f114a109b07be2c2c1c6c169e34e9bb3.tar.xz linux-dev-7c7e9425f114a109b07be2c2c1c6c169e34e9bb3.zip | |
[PATCH] memory hotplug: fix compile error for i386 with NUMA config
Fix compile error when config memory hotplug with numa on i386.
The cause of compile error was missing of arch_add_memory(),
remove_memory(), and memory_add_physaddr_to_nid().
Signed-off-by: Yasunori Goto <y-goto@jp.fujitsu.com>
Acked-by: David Rientjes <rientjes@cs.washington.edu>
Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/mm/init.c')
| -rw-r--r-- | arch/i386/mm/init.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c index 84697dfc7348..60a7e57af197 100644 --- a/arch/i386/mm/init.c +++ b/arch/i386/mm/init.c @@ -673,16 +673,10 @@ void __init mem_init(void) #endif } -/* - * this is for the non-NUMA, single node SMP system case. - * Specifically, in the case of x86, we will always add - * memory to the highmem for now. - */ #ifdef CONFIG_MEMORY_HOTPLUG -#ifndef CONFIG_NEED_MULTIPLE_NODES int arch_add_memory(int nid, u64 start, u64 size) { - struct pglist_data *pgdata = &contig_page_data; + struct pglist_data *pgdata = NODE_DATA(nid); struct zone *zone = pgdata->node_zones + ZONE_HIGHMEM; unsigned long start_pfn = start >> PAGE_SHIFT; unsigned long nr_pages = size >> PAGE_SHIFT; @@ -694,7 +688,7 @@ int remove_memory(u64 start, u64 size) { return -EINVAL; } -#endif +EXPORT_SYMBOL_GPL(remove_memory); #endif struct kmem_cache *pgd_cache; |