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

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

Merge "Perf: arm64: enable idle_update at end of probe"

parents 6820cd34 8b04088a
Loading
Loading
Loading
Loading
+14 −10
Original line number Diff line number Diff line
@@ -1189,20 +1189,24 @@ static int armv8_pmu_device_probe(struct platform_device *pdev)
{
	int ret, cpu;

	/* set to true so armv8pmu_idle_update doesn't try to load
	 * hw_events before arm_pmu_device_probe has initialized it.
	 */
	for_each_possible_cpu(cpu) {
		per_cpu(is_hotplugging, cpu) = true;
	}

	ret = arm_pmu_device_probe(pdev, armv8_pmu_of_device_ids,
		(acpi_disabled ?  NULL : armv8_pmu_probe_table));

	if (!ret) {
		for_each_possible_cpu(cpu)
			per_cpu(is_hotplugging, cpu) = false;

		ret = perf_event_cpu_hp_init();
	}

	if (ret)
	return ret;

	if (acpi_disabled)
		return arm_pmu_device_probe(pdev, armv8_pmu_of_device_ids,
					    NULL);

	return arm_pmu_device_probe(pdev, armv8_pmu_of_device_ids,
				    armv8_pmu_probe_table);
}

static struct platform_driver armv8_pmu_driver = {