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

Commit 24b86839 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 585457fc 0fec9557

kernel/cpu.c

+0 −2
Original line number Diff line number Diff line
@@ -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;