From: Andrew Morton Cc: Yasunori Goto Cc: Dave Hansen Cc: "Brown, Len" Signed-off-by: Andrew Morton --- arch/i386/mm/init.c | 2 +- include/linux/memory_hotplug.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -puN arch/i386/mm/init.c~pgdat-allocation-for-new-node-add-specify-node-id-tidy arch/i386/mm/init.c --- devel/arch/i386/mm/init.c~pgdat-allocation-for-new-node-add-specify-node-id-tidy 2006-04-30 00:30:38.000000000 -0700 +++ devel-akpm/arch/i386/mm/init.c 2006-04-30 00:30:38.000000000 -0700 @@ -665,7 +665,7 @@ void __init mem_init(void) */ #ifdef CONFIG_MEMORY_HOTPLUG #ifndef CONFIG_NEED_MULTIPLE_NODES -int arch_add_memory(int nid, u64 start , u64 size) +int arch_add_memory(int nid, u64 start, u64 size) { struct pglist_data *pgdata = &contig_page_data; struct zone *zone = pgdata->node_zones + MAX_NR_ZONES-1; diff -puN include/linux/memory_hotplug.h~pgdat-allocation-for-new-node-add-specify-node-id-tidy include/linux/memory_hotplug.h --- devel/include/linux/memory_hotplug.h~pgdat-allocation-for-new-node-add-specify-node-id-tidy 2006-04-30 00:30:38.000000000 -0700 +++ devel-akpm/include/linux/memory_hotplug.h 2006-04-30 00:30:38.000000000 -0700 @@ -64,7 +64,7 @@ extern int online_pages(unsigned long, u extern int __add_pages(struct zone *zone, unsigned long start_pfn, unsigned long nr_pages); -#if defined(CONFIG_NUMA) +#ifdef CONFIG_NUMA extern int memory_add_physaddr_to_nid(u64 start); #else static inline int memofy_add_physaddr_to_nid(u64 start) _