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

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

Merge "perf: replace cpu_up/down with device_online/offline"

parents 9046a2c0 5cccbcfc

arch/arm64/kernel/perf_event.c

+6 −2
Original line number Diff line number Diff line
@@ -1915,7 +1915,9 @@ static __ref void reset_pmu_force(void) 
	for_each_possible_cpu(cpu) {

		if (!cpu_online(cpu)) {

			save_online_mask |= BIT(cpu);

			ret = cpu_up(cpu);

			lock_device_hotplug();

			ret = device_online(get_cpu_device(cpu));

			unlock_device_hotplug();

			if (ret)

				pr_err("Failed to bring up CPU: %d, ret: %d\n",

				       cpu, ret);
@@ -1927,7 +1929,9 @@ static __ref void reset_pmu_force(void) 
		armpmu_release_hardware(cpu_pmu);

	for_each_possible_cpu(cpu) {

		if ((save_online_mask & BIT(cpu)) && cpu_online(cpu)) {

			ret = cpu_down(cpu);

			lock_device_hotplug();

			ret = device_offline(get_cpu_device(cpu));

			unlock_device_hotplug();

			if (ret)

				pr_err("Failed to bring down CPU: %d, ret: %d\n",

						cpu, ret);