Patchwork powerpc/booke64: check napping in performance monitor interrupt

login
register
mail settings
Submitter Kevin Hao
Date Sept. 26, 2013, 8:23 a.m.
Message ID <1380183836-17039-1-git-send-email-haokexin@gmail.com>
Download mbox | patch
Permalink /patch/278133/
State Accepted
Commit e48673360b8b113ca83dc3a45e02ad37fdf9f2d0
Delegated to: Benjamin Herrenschmidt
Headers show

Comments

Kevin Hao - Sept. 26, 2013, 8:23 a.m.
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>
---
 arch/powerpc/kernel/exceptions-64e.S | 1 +
 1 file changed, 1 insertion(+)

Patch

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