diff options
| -rw-r--r-- | arch/powerpc/perf/core-book3s.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c index 6b0641c3f03f..fe52db2eea6a 100644 --- a/arch/powerpc/perf/core-book3s.c +++ b/arch/powerpc/perf/core-book3s.c | |||
| @@ -1307,6 +1307,9 @@ static void power_pmu_enable(struct pmu *pmu) | |||
| 1307 | out_enable: | 1307 | out_enable: |
| 1308 | pmao_restore_workaround(ebb); | 1308 | pmao_restore_workaround(ebb); |
| 1309 | 1309 | ||
| 1310 | if (ppmu->flags & PPMU_ARCH_207S) | ||
| 1311 | mtspr(SPRN_MMCR2, 0); | ||
| 1312 | |||
| 1310 | mmcr0 = ebb_switch_in(ebb, cpuhw->mmcr[0]); | 1313 | mmcr0 = ebb_switch_in(ebb, cpuhw->mmcr[0]); |
| 1311 | 1314 | ||
| 1312 | mb(); | 1315 | mb(); |
| @@ -1315,9 +1318,6 @@ static void power_pmu_enable(struct pmu *pmu) | |||
| 1315 | 1318 | ||
| 1316 | write_mmcr0(cpuhw, mmcr0); | 1319 | write_mmcr0(cpuhw, mmcr0); |
| 1317 | 1320 | ||
| 1318 | if (ppmu->flags & PPMU_ARCH_207S) | ||
| 1319 | mtspr(SPRN_MMCR2, 0); | ||
| 1320 | |||
| 1321 | /* | 1321 | /* |
| 1322 | * Enable instruction sampling if necessary | 1322 | * Enable instruction sampling if necessary |
| 1323 | */ | 1323 | */ |
