diff options
| author | Kevin Hao <haokexin@gmail.com> | 2013-09-26 08:23:56 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-08 00:03:29 (GMT) |
| commit | 17ee924b5343c1b8fb6f02cee1729eca251b62af (patch) | |
| tree | 304bb044715123770b1552881aa387d2aee8d17f /arch/powerpc/kernel | |
| parent | f67f9e3b21d00dfc19774f43a5b451cde46ff362 (diff) | |
| download | linux-fsl-qoriq-17ee924b5343c1b8fb6f02cee1729eca251b62af.tar.xz | |
powerpc/booke64: Check napping in performance monitor interrupt
The performance monitor interrupt is asynchronous, so we should check
if the current processor is in napping status in the handler of this
interrupt.
Signed-off-by: Kevin Hao <haokexin@gmail.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
(cherry picked from commit e48673360b8b113ca83dc3a45e02ad37fdf9f2d0)
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/exceptions-64e.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S index 587a04b..e775156 100644 --- a/arch/powerpc/kernel/exceptions-64e.S +++ b/arch/powerpc/kernel/exceptions-64e.S @@ -608,6 +608,7 @@ kernel_dbg_exc: NORMAL_EXCEPTION_PROLOG(0x260, BOOKE_INTERRUPT_PERFORMANCE_MONITOR, PROLOG_ADDITION_NONE) EXCEPTION_COMMON(0x260, PACA_EXGEN, INTS_DISABLE) + CHECK_NAPPING() addi r3,r1,STACK_FRAME_OVERHEAD bl .performance_monitor_exception b .ret_from_except_lite |