Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98a38ebd authored by Andy Whitcroft's avatar Andy Whitcroft Committed by Linus Torvalds
Browse files

[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: default avatarAndy Whitcroft <apw@shadowen.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5ac24eef

drivers/base/memory.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -49,12 +49,12 @@ static struct kset_uevent_ops memory_uevent_ops = { 




static struct notifier_block *memory_chain;

static struct notifier_block *memory_chain;





static int register_memory_notifier(struct notifier_block *nb)

int register_memory_notifier(struct notifier_block *nb)

{

{

        return notifier_chain_register(&memory_chain, nb);

        return notifier_chain_register(&memory_chain, nb);

}

}





static void unregister_memory_notifier(struct notifier_block *nb)

void unregister_memory_notifier(struct notifier_block *nb)

{

{

        notifier_chain_unregister(&memory_chain, nb);

        notifier_chain_unregister(&memory_chain, nb);

}

}