From d07644a97726d621efae7124bdd23cf721a8304c Mon Sep 17 00:00:00 2001 From: Al Viro Date: Fri, 25 May 2012 17:09:58 -0400 Subject: [PATCH] powerpc: missing NOTIFY_RESUME check on 64bit if CONFIG_PREEMPT is set code too smart for its own good - apparently got missed when NOTIFY_RESUME had been added... Signed-off-by: Al Viro --- arch/powerpc/kernel/entry_64.S | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S index ed1718feb9d9..e4fd9bbf4448 100644 --- a/arch/powerpc/kernel/entry_64.S +++ b/arch/powerpc/kernel/entry_64.S @@ -563,9 +563,10 @@ _GLOBAL(ret_from_except_lite) li r0,_TIF_NEED_RESCHED /* bits to check */ ld r3,_MSR(r1) ld r4,TI_FLAGS(r9) - /* Move MSR_PR bit in r3 to _TIF_SIGPENDING position in r0 */ + /* Add MSR_PR bit in r3 in _TIF_SIGPENDING and _TIF_NOTIFY_RESUME positions in r0 */ rlwimi r0,r3,32+TIF_SIGPENDING-MSR_PR_LG,_TIF_SIGPENDING - and. r0,r4,r0 /* check NEED_RESCHED and maybe SIGPENDING */ + rlwimi r0,r3,32+TIF_NOTIFY_RESUME-MSR_PR_LG,_TIF_NOTIFY_RESUME + and. r0,r4,r0 /* check NEED_RESCHED and maybe SIGPENDING/NOTIFY_RESUME */ bne do_work #else /* !CONFIG_PREEMPT */ -- 2.39.5