projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'cpu-hotplug-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
mm
/
zswap.c
diff --git
a/mm/zswap.c
b/mm/zswap.c
index e55bab9dc41f81ab1b6384710e918f3839e0c936..d7337fbf66053219ab0e72e5e9b2c0b7e17d2bb7 100644
(file)
--- a/
mm/zswap.c
+++ b/
mm/zswap.c
@@
-387,18
+387,18
@@
static int zswap_cpu_init(void)
{
unsigned long cpu;
{
unsigned long cpu;
-
get_online_cpus
();
+
cpu_notifier_register_begin
();
for_each_online_cpu(cpu)
if (__zswap_cpu_notifier(CPU_UP_PREPARE, cpu) != NOTIFY_OK)
goto cleanup;
for_each_online_cpu(cpu)
if (__zswap_cpu_notifier(CPU_UP_PREPARE, cpu) != NOTIFY_OK)
goto cleanup;
- register_cpu_notifier(&zswap_cpu_notifier_block);
-
put_online_cpus
();
+
__
register_cpu_notifier(&zswap_cpu_notifier_block);
+
cpu_notifier_register_done
();
return 0;
cleanup:
for_each_online_cpu(cpu)
__zswap_cpu_notifier(CPU_UP_CANCELED, cpu);
return 0;
cleanup:
for_each_online_cpu(cpu)
__zswap_cpu_notifier(CPU_UP_CANCELED, cpu);
-
put_online_cpus
();
+
cpu_notifier_register_done
();
return -ENOMEM;
}
return -ENOMEM;
}