diff options
| author | Kevin Hao <haokexin@gmail.com> | 2013-09-26 16:23:56 +0800 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-10-11 16:53:09 +1100 |
| commit | e48673360b8b113ca83dc3a45e02ad37fdf9f2d0 (patch) | |
| tree | cff57e1b1bfac9ae09ee9cddb37e131e0b9c8d32 /arch/powerpc/kernel | |
| parent | cf059965713b71b7301fd88f1e98b31c6484dd46 (diff) | |
| download | op-kernel-dev-e48673360b8b113ca83dc3a45e02ad37fdf9f2d0.zip op-kernel-dev-e48673360b8b113ca83dc3a45e02ad37fdf9f2d0.tar.gz | |
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>
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 2d06704..68d74b4 100644 --- a/arch/powerpc/kernel/exceptions-64e.S +++ b/arch/powerpc/kernel/exceptions-64e.S @@ -607,6 +607,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 |
