Fix compilation with CONFIG_MEMORY_HOTPLUG=y and gcc41.
Subsystems (3)
PATCH 1/1 Fix compilation with CONFIG_MEMORY_HOTPLUG=y and gcc41.
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
drivers/base/memory.c:46: warning: initialization from incompatible pointer type
drivers/base/memory.c | 2 +- include/linux/memory.h | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-)
include/linux/memory.h +1 -7
@@ -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<<PAGE_SHIFT) -extern int invalidate_phys_mapping (unsigned long ,unsigned long );struct notifier_block ; -extern int register_memory_notifier (struct notifier_block *nb); -extern void unregister_memory_notifier (struct notifier_block *nb); -#endif /* CONFIG_MEMORY_HOTPLUG */ #define hotplug_memory_notifier (fn, pri) { \
drivers/base/memory.c +1 -1
@@ -29,7 +29,7 @@ static struct sysdev_class memory_sysdev set_kset_name(MEMORY_CLASS_NAME), }; -static char *memory_hotplug_name (struct kset *kset,struct kobject *kobj) +static const char *memory_hotplug_name (struct kset *kset,struct kobject *kobj) {return MEMORY_CLASS_NAME ; }
Signature · 2 lines
short story of a lazy sysadmin: alias appserv=wotan