From: Kevin Hao Date: Thu, 26 Sep 2013 08:23:56 +0000 (+0800) Subject: powerpc/booke64: Check napping in performance monitor interrupt X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e48673360b8b113ca83dc3a45e02ad37fdf9f2d0;p=GitHub%2FLineageOS%2FG12%2Fandroid_kernel_amlogic_linux-4.9.git 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 Signed-off-by: Benjamin Herrenschmidt --- diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S index 2d067049db27..68d74b45232d 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