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
power_supply: bq25700: set default input voltage ane current when shutdown
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
cpu.c
diff --git
a/kernel/cpu.c
b/kernel/cpu.c
index 9ced7c7516481f05549c48e6b2d3ae1bf5f36f61..c8a1751be2244233f7ebeea0db601593b3e468a3 100644
(file)
--- a/
kernel/cpu.c
+++ b/
kernel/cpu.c
@@
-185,10
+185,17
@@
void cpu_hotplug_disable(void)
}
EXPORT_SYMBOL_GPL(cpu_hotplug_disable);
}
EXPORT_SYMBOL_GPL(cpu_hotplug_disable);
+static void __cpu_hotplug_enable(void)
+{
+ if (WARN_ONCE(!cpu_hotplug_disabled, "Unbalanced cpu hotplug enable\n"))
+ return;
+ cpu_hotplug_disabled--;
+}
+
void cpu_hotplug_enable(void)
{
cpu_maps_update_begin();
void cpu_hotplug_enable(void)
{
cpu_maps_update_begin();
-
WARN_ON(--cpu_hotplug_disabled < 0
);
+
__cpu_hotplug_enable(
);
cpu_maps_update_done();
}
EXPORT_SYMBOL_GPL(cpu_hotplug_enable);
cpu_maps_update_done();
}
EXPORT_SYMBOL_GPL(cpu_hotplug_enable);
@@
-631,7
+638,7
@@
void enable_nonboot_cpus(void)
/* Allow everyone to use the CPU hotplug again */
cpu_maps_update_begin();
/* Allow everyone to use the CPU hotplug again */
cpu_maps_update_begin();
-
WARN_ON(--cpu_hotplug_disabled < 0
);
+
__cpu_hotplug_enable(
);
if (cpumask_empty(frozen_cpus))
goto out;
if (cpumask_empty(frozen_cpus))
goto out;