powerpc/perf: Fix MMCR2 handling for EBB
authorMichael Ellerman <mpe@ellerman.id.au>
Wed, 23 Jul 2014 07:20:04 +0000 (17:20 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 23 Jul 2014 07:16:47 +0000 (17:16 +1000)
In the recent commit b50a6c584bb4 "Clear MMCR2 when enabling PMU", I
screwed up the handling of MMCR2 for tasks using EBB.

We must make sure we set MMCR2 *before* ebb_switch_in(), otherwise we
overwrite the value of MMCR2 that userspace may have written. That
potentially breaks a task that uses EBB and manually uses MMCR2 for
event freezing.

Fixes: b50a6c584bb4 ("powerpc/perf: Clear MMCR2 when enabling PMU")
Cc: stable@vger.kernel.org
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/perf/core-book3s.c

Simple merge