From: Andrew Morton This is back again. Offending patch is x86_64-mm-hotadd-reserve.patch arch/arm/kernel/setup.c:435: error: conflicting types for 'add_memory' include/linux/memory_hotplug.h:102: error: previous declaration of 'add_memory' was here arch/arm/kernel/setup.c:435: error: conflicting types for 'add_memory' include/linux/memory_hotplug.h:102: error: previous declaration of 'add_memory' was here Cc: Andi Kleen Cc: Russell King Signed-off-by: Andrew Morton --- arch/arm/kernel/setup.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff -puN arch/arm/kernel/setup.c~arm-add_memory-build-fix arch/arm/kernel/setup.c --- devel/arch/arm/kernel/setup.c~arm-add_memory-build-fix 2006-04-14 23:41:49.000000000 -0700 +++ devel-akpm/arch/arm/kernel/setup.c 2006-04-14 23:41:49.000000000 -0700 @@ -437,7 +437,7 @@ static void __init early_initrd(char **p } __early_param("initrd=", early_initrd); -static void __init add_memory(unsigned long start, unsigned long size) +static void __init arm_add_memory(unsigned long start, unsigned long size) { /* * Ensure that start/size are aligned to a page boundary. @@ -475,7 +475,7 @@ static void __init early_mem(char **p) if (**p == '@') start = memparse(*p + 1, p); - add_memory(start, size); + arm_add_memory(start, size); } __early_param("mem=", early_mem); @@ -617,7 +617,7 @@ static int __init parse_tag_mem32(const tag->u.mem.start, tag->u.mem.size / 1024); return -EINVAL; } - add_memory(tag->u.mem.start, tag->u.mem.size); + arm_add_memory(tag->u.mem.start, tag->u.mem.size); return 0; } _