From: Olaf Hering Fix compilation with CONFIG_MEMORY_HOTPLUG=y and gcc41. Also remove unneeded declations, add a public function. drivers/base/memory.c:53: error: static declaration of 'register_memory_notifier' follows non-static declaration include/linux/memory.h:85: error: previous declaration of 'register_memory_notifier' was here drivers/base/memory.c:58: error: static declaration of 'unregister_memory_notifier' follows non-static declaration include/linux/memory.h:86: error: previous declaration of 'unregister_memory_notifier' was here drivers/base/memory.c:68: error: static declaration of 'register_memory' follows non-static declaration include/linux/memory.h:73: error: previous declaration of 'register_memory' was here Signed-off-by: Olaf Hering Signed-off-by: Andrew Morton --- include/linux/memory.h | 8 +------- 1 files changed, 1 insertion(+), 7 deletions(-) diff -puN include/linux/memory.h~fix-compilation-with-config_memory_hotplug=y-and-gcc41 include/linux/memory.h --- devel/include/linux/memory.h~fix-compilation-with-config_memory_hotplug=y-and-gcc41 2006-01-07 04:24:38.000000000 -0800 +++ devel-akpm/include/linux/memory.h 2006-01-07 04:24:38.000000000 -0800 @@ -70,21 +70,15 @@ static inline void unregister_memory_not { } #else -extern int register_memory(struct memory_block *, struct mem_section *section, struct node *); extern int register_new_memory(struct mem_section *); extern int unregister_memory_section(struct mem_section *); extern int memory_dev_init(void); -extern int register_memory_notifier(struct notifier_block *nb); -extern void unregister_memory_notifier(struct notifier_block *nb); +extern int remove_memory_block(unsigned long, struct mem_section *, int) #define CONFIG_MEM_BLOCK_SIZE (PAGES_PER_SECTION<