diff options
| author | Jeremy Gebben <jgebben@codeaurora.org> | 2016-04-26 09:40:19 -0600 |
|---|---|---|
| committer | Kyle Yan <kyan@codeaurora.org> | 2016-04-27 19:04:59 -0700 |
| commit | f5921cfca0db89db6ab7ced7ea46348179dae0e2 (patch) | |
| tree | 16d03bd9931fad03753d953c0fa5a958d4d598f3 | |
| parent | 640db7a76de9ee1c60e7fcdbdc03ca202c4b8e2b (diff) | |
Revert "perf: replace cpu_up/down with device_online/offline"
This reverts commit 38dccacd2b37382159a
("perf: replace cpu_up/down with device_online/offline")
This change is being reverted so that it can be replaced
by equivalent functionality from upstream.
CRs-Fixed: 1008368
Change-Id: Ic19addb342e20c6e87f7781a02bed4f0094e80c5
Signed-off-by: Jeremy Gebben <jgebben@codeaurora.org>
| -rw-r--r-- | drivers/perf/arm_pmu.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index e49904c2c540..9795842e700a 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -1164,9 +1164,7 @@ static __ref void reset_pmu_force(void) for_each_possible_cpu(cpu) { if (!cpu_online(cpu)) { save_online_mask |= BIT(cpu); - lock_device_hotplug(); - ret = device_online(get_cpu_device(cpu)); - unlock_device_hotplug(); + ret = cpu_up(cpu); if (ret) pr_err("Failed to bring up CPU: %d, ret: %d\n", cpu, ret); @@ -1178,9 +1176,7 @@ 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)) { - lock_device_hotplug(); - ret = device_online(get_cpu_device(cpu)); - unlock_device_hotplug(); + ret = cpu_down(cpu); if (ret) pr_err("Failed to bring down CPU: %d, ret: %d\n", cpu, ret); |