diff options
| author | Nicholas Piggin <npiggin@gmail.com> | 2018-05-10 11:04:23 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-06-03 20:40:29 +1000 |
| commit | 81ea11d3af3aba0bea475dd1dd2f79977a761239 (patch) | |
| tree | 1c92a18f8fe2263ecb05120712cec157f22c68e3 | |
| parent | e360cd37f0e9bac7b5f623132549e2d4b6417399 (diff) | |
| download | op-kernel-dev-81ea11d3af3aba0bea475dd1dd2f79977a761239.zip op-kernel-dev-81ea11d3af3aba0bea475dd1dd2f79977a761239.tar.gz | |
powerpc/pmu/fsl: fix is_nmi test for irq mask change
When soft enabled was changed to irq disabled mask, this test missed
being converted (although the equivalent book3s test was converted).
The PMU drivers consider it an NMI when they take a PMI while general
interrupts are disabled. This change restores that behaviour.
Fixes: 01417c6cc7 ("powerpc/64: Change soft_enabled from flag to bitmask")
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
Reviewed-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
| -rw-r--r-- | arch/powerpc/perf/core-fsl-emb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/perf/core-fsl-emb.c b/arch/powerpc/perf/core-fsl-emb.c index 85f1d18..ba48584 100644 --- a/arch/powerpc/perf/core-fsl-emb.c +++ b/arch/powerpc/perf/core-fsl-emb.c @@ -42,7 +42,7 @@ static DEFINE_MUTEX(pmc_reserve_mutex); static inline int perf_intr_is_nmi(struct pt_regs *regs) { #ifdef __powerpc64__ - return !regs->softe; + return (regs->softe & IRQS_DISABLED); #else return 0; #endif |
