aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/perf_event.c
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2012-07-28 11:27:03 -0400
committerWill Deacon <will.deacon@arm.com>2012-08-23 06:35:51 -0400
commitf0d1bc47953743aef9d2ed5326bc5973a3db08ab (patch)
treeda83dfd3a4ec6e92da3401a0563072bdfb3afccc /arch/arm/kernel/perf_event.c
parent50243efde0993f6fe98f27a35692d0e8efdf7a0f (diff)
ARM: pmu: remove unused reservation mechanism
The PMU reservation mechanism was originally intended to allow OProfile and perf-events to co-ordinate over access to the CPU PMU. Since then, OProfile for ARM has moved to using perf as its backend, so the reservation code is no longer used. This patch removes the reservation code for the CPU PMU on ARM. Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm/kernel/perf_event.c')
-rw-r--r--arch/arm/kernel/perf_event.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/kernel/perf_event.c b/arch/arm/kernel/perf_event.c
index 3aa338849133..1ac1531dcfef 100644
--- a/arch/arm/kernel/perf_event.c
+++ b/arch/arm/kernel/perf_event.c
@@ -377,7 +377,6 @@ armpmu_release_hardware(struct arm_pmu *armpmu)
377 } 377 }
378 378
379 pm_runtime_put_sync(&pmu_device->dev); 379 pm_runtime_put_sync(&pmu_device->dev);
380 release_pmu(armpmu->type);
381} 380}
382 381
383static int 382static int
@@ -391,12 +390,6 @@ armpmu_reserve_hardware(struct arm_pmu *armpmu)
391 if (!pmu_device) 390 if (!pmu_device)
392 return -ENODEV; 391 return -ENODEV;
393 392
394 err = reserve_pmu(armpmu->type);
395 if (err) {
396 pr_warning("unable to reserve pmu\n");
397 return err;
398 }
399
400 plat = dev_get_platdata(&pmu_device->dev); 393 plat = dev_get_platdata(&pmu_device->dev);
401 if (plat && plat->handle_irq) 394 if (plat && plat->handle_irq)
402 handle_irq = armpmu_platform_irq; 395 handle_irq = armpmu_platform_irq;
@@ -706,7 +699,6 @@ static void __init cpu_pmu_init(struct arm_pmu *armpmu)
706 raw_spin_lock_init(&events->pmu_lock); 699 raw_spin_lock_init(&events->pmu_lock);
707 } 700 }
708 armpmu->get_hw_events = armpmu_get_cpu_events; 701 armpmu->get_hw_events = armpmu_get_cpu_events;
709 armpmu->type = ARM_PMU_DEVICE_CPU;
710} 702}
711 703
712/* 704/*