summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-01-22 12:45:47 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-01-22 12:45:47 -0800
commit24b86839fab8e8059d2b16e0067dc86a1a0d3514 (patch)
treed764e86e2bae3ef57779912ed062be725b1ca431
parent585457fc8383e373ab923e46cd1f70bbfe46763f (diff)
parent0fec9557fd0c5349e3bd1a2141612a60bc20bb71 (diff)
downloadlinux-24b86839fab8e8059d2b16e0067dc86a1a0d3514.tar.bz2
Merge branch 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull smp/hotplug fix from Thomas Gleixner: "Remove an unused variable which is a leftover from the notifier removal" * 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: cpu/hotplug: Remove unused but set variable in _cpu_down()
-rw-r--r--kernel/cpu.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/cpu.c b/kernel/cpu.c
index c47506357519..0a5f630f5c54 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -764,7 +764,6 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,
{
struct cpuhp_cpu_state *st = per_cpu_ptr(&cpuhp_state, cpu);
int prev_state, ret = 0;
- bool hasdied = false;
if (num_online_cpus() == 1)
return -EBUSY;
@@ -809,7 +808,6 @@ static int __ref _cpu_down(unsigned int cpu, int tasks_frozen,
cpuhp_kick_ap_work(cpu);
}
- hasdied = prev_state != st->state && st->state == CPUHP_OFFLINE;
out:
cpu_hotplug_done();
return ret;