Skip to contentSkip to conversation

ARM: Fix ARM11 MPCore OProfile breakage due to ARM patch 5901/2

PATCH New George G. Davis 1 participant 1 message Feb 5, 2010 Arm (32-bit)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: Fix ARM11 MPCore OProfile breakage due to ARM patch 5901/2

The recent "fe6c67f ARM: 5901/2: arm/oprofile: reserve the PMU when starting" commit broke OProfile support on ARM11 MPCore targets by adding a misplaced "} else {" clause in function em_start() which results in a call to release_pmu() even though the PMU is in use which in turn results in an oops while using OProfile. Removing the stray else clause fixes the problem.

---
 arch/arm/oprofile/op_model_mpcore.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
arch/arm/oprofile/op_model_mpcore.c +0 -1
index f73ce87..0d4f099 100644
@@ -246,7 +246,6 @@ static int em_start(void)
 		if (ret) {
 			arm11_release_interrupts(pmu_irqs->irqs,
 						 pmu_irqs->num_irqs);
-		} else {
 			release_pmu(pmu_irqs);
 			pmu_irqs = NULL;
 		}

--
Regards,
George