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

Commit 38ce3880 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cpuhotplug: fix cleanup issue in hotplug fail path"

parents 57d3486c ff2341aa

kernel/cpu.c

+0 −3
Original line number Diff line number Diff line
@@ -521,7 +521,6 @@ static int cpuhp_up_callbacks(unsigned int cpu, struct cpuhp_cpu_state *st, 
		if (ret) {

			st->target = prev_state;

			undo_cpu_up(cpu, st);

			cpu_notify(CPU_UP_CANCELED, cpu);

			break;

		}

	}
@@ -1381,7 +1380,6 @@ static struct cpuhp_step cpuhp_bp_states[] = { 
		.name			= "notify:prepare",

		.startup.single		= notify_prepare,

		.teardown.single	= notify_dead,

		.skip_onerr		= true,

		.cant_stop		= true,

	},

	/*
@@ -1487,7 +1485,6 @@ static struct cpuhp_step cpuhp_ap_states[] = { 
		.name			= "notify:online",

		.startup.single		= notify_online,

		.teardown.single	= notify_down_prepare,

		.skip_onerr		= true,

	},

#endif

	/*