Merge "cpuhotplug: fix cleanup issue in hotplug fail path" (38ce3880) · Commits · e / devices / android_kernel_fairphone_FP3

kernel/cpu.c

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -521,7 +521,6 @@ static int cpuhp_up_callbacks(unsigned int cpu, struct cpuhp_cpu_state *st,
	if (ret) {		if (ret) {
	st->target = prev_state;		st->target = prev_state;
	undo_cpu_up(cpu, st);		undo_cpu_up(cpu, st);
	cpu_notify(CPU_UP_CANCELED, cpu);
	break;		break;
	}		}
	}		}
	@@ -1381,7 +1380,6 @@ static struct cpuhp_step cpuhp_bp_states[] = {
	.name = "notify:prepare",		.name = "notify:prepare",
	.startup.single = notify_prepare,		.startup.single = notify_prepare,
	.teardown.single = notify_dead,		.teardown.single = notify_dead,
	.skip_onerr = true,
	.cant_stop = true,		.cant_stop = true,
	},		},
	/*		/*
	@@ -1487,7 +1485,6 @@ static struct cpuhp_step cpuhp_ap_states[] = {
	.name = "notify:online",		.name = "notify:online",
	.startup.single = notify_online,		.startup.single = notify_online,
	.teardown.single = notify_down_prepare,		.teardown.single = notify_down_prepare,
	.skip_onerr = true,
	},		},
	#endif		#endif
	/*		/*