From 4c061271ea6cfddbccda474e84a969bb27a7ddb2 Mon Sep 17 00:00:00 2001 From: Mark Rutland Date: Mon, 6 Jun 2011 10:37:50 +0100 Subject: [PATCH] --- yaml --- r: 270133 b: refs/heads/master c: 7ae18a5717cbbf1879bdd5b66d7009a9958e5aef h: refs/heads/master i: 270131: d7096cda269ffa9548d7acd1a0cab0d8f69bef22 v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/perf_event.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8a6fccae4975..412adbbfa0a6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f78d2d5ccf72ec834da6901886a40fd8e3b7615 +refs/heads/master: 7ae18a5717cbbf1879bdd5b66d7009a9958e5aef diff --git a/trunk/arch/arm/kernel/perf_event.c b/trunk/arch/arm/kernel/perf_event.c index 9331d5731445..1a2ebbf07fb7 100644 --- a/trunk/arch/arm/kernel/perf_event.c +++ b/trunk/arch/arm/kernel/perf_event.c @@ -60,6 +60,7 @@ static DEFINE_PER_CPU(struct cpu_hw_events, cpu_hw_events); struct arm_pmu { enum arm_perf_pmu_ids id; + enum arm_pmu_type type; cpumask_t active_irqs; const char *name; irqreturn_t (*handle_irq)(int irq_num, void *dev); @@ -396,7 +397,7 @@ armpmu_release_hardware(void) free_irq(irq, NULL); } - release_pmu(ARM_PMU_DEVICE_CPU); + release_pmu(armpmu->type); } static int @@ -407,7 +408,7 @@ armpmu_reserve_hardware(void) int i, err, irq, irqs; struct platform_device *pmu_device = armpmu->plat_device; - err = reserve_pmu(ARM_PMU_DEVICE_CPU); + err = reserve_pmu(armpmu->type); if (err) { pr_warning("unable to reserve pmu\n"); return err; @@ -691,6 +692,7 @@ static void __init cpu_pmu_init(struct arm_pmu *armpmu) raw_spin_lock_init(&events->pmu_lock); } armpmu->get_hw_events = armpmu_get_cpu_events; + armpmu->type = ARM_PMU_DEVICE_CPU; } /*