From: Andrew Morton Date: Mon, 29 Apr 2013 22:08:08 +0000 (-0700) Subject: fs/proc/kcore.c: use register_hotmemory_notifier() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3c743a7f7b682dedef188664514c0ea82e232742;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git fs/proc/kcore.c: use register_hotmemory_notifier() Saves an ifdef, no code size changes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/fs/proc/kcore.c b/fs/proc/kcore.c index eda6f017f272..f6a13f489e30 100644 --- a/fs/proc/kcore.c +++ b/fs/proc/kcore.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include #include @@ -564,7 +565,6 @@ static const struct file_operations proc_kcore_operations = { .llseek = default_llseek, }; -#ifdef CONFIG_MEMORY_HOTPLUG /* just remember that we have to update kcore */ static int __meminit kcore_callback(struct notifier_block *self, unsigned long action, void *arg) @@ -578,8 +578,11 @@ static int __meminit kcore_callback(struct notifier_block *self, } return NOTIFY_OK; } -#endif +static struct notifier_block kcore_callback_nb __meminitdata = { + .notifier_call = kcore_callback, + .priority = 0, +}; static struct kcore_list kcore_vmalloc; @@ -631,7 +634,7 @@ static int __init proc_kcore_init(void) add_modules_range(); /* Store direct-map area from physical memory map */ kcore_update_ram(); - hotplug_memory_notifier(kcore_callback, 0); + register_hotmemory_notifier(&kcore_callback_nb); return 0; }