Skip to content

Commit

Permalink
[PATCH] Fix compilation with CONFIG_MEMORY_HOTPLUG=y and gcc41.
Browse files Browse the repository at this point in the history
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 <olh@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Olaf Hering authored and Linus Torvalds committed Jan 9, 2006
1 parent 4dab06f commit b792de3
Showing 1 changed file with 1 addition and 7 deletions.
8 changes: 1 addition & 7 deletions include/linux/memory.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,21 +70,15 @@ static inline void unregister_memory_notifier(struct notifier_block *nb)
{
}
#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) { \
Expand Down

0 comments on commit b792de3

Please sign in to comment.