diff options
author | Andy Whitcroft <apw@shadowen.org> | 2006-01-06 03:10:35 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-06 11:33:21 -0500 |
commit | 98a38ebdda69f1498be4f618d8d919695c8d6352 (patch) | |
tree | b3d9ff9de113375eaa34b396de7f962284145028 /drivers/base/memory.c | |
parent | 5ac24eefd1d89bc6aa2817741c3bd5d4205b2efd (diff) |
[PATCH] memhotplug: register_ and unregister_memory_notifier should be global
Both register_memory_notifer and unregister_memory_notifier are global and
declared so in linux/memory.h. Update the HOTPLUG specific definitions to
match. This fixes a compile warning when HOTPLUG is enabled.
Signed-off-by: Andy Whitcroft <apw@shadowen.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/base/memory.c')
-rw-r--r-- | drivers/base/memory.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/memory.c b/drivers/base/memory.c index 7e1d077874df..19fe93155fe6 100644 --- a/drivers/base/memory.c +++ b/drivers/base/memory.c | |||
@@ -49,12 +49,12 @@ static struct kset_uevent_ops memory_uevent_ops = { | |||
49 | 49 | ||
50 | static struct notifier_block *memory_chain; | 50 | static struct notifier_block *memory_chain; |
51 | 51 | ||
52 | static int register_memory_notifier(struct notifier_block *nb) | 52 | int register_memory_notifier(struct notifier_block *nb) |
53 | { | 53 | { |
54 | return notifier_chain_register(&memory_chain, nb); | 54 | return notifier_chain_register(&memory_chain, nb); |
55 | } | 55 | } |
56 | 56 | ||
57 | static void unregister_memory_notifier(struct notifier_block *nb) | 57 | void unregister_memory_notifier(struct notifier_block *nb) |
58 | { | 58 | { |
59 | notifier_chain_unregister(&memory_chain, nb); | 59 | notifier_chain_unregister(&memory_chain, nb); |
60 | } | 60 | } |