aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ppc/kernel')
-rw-r--r--arch/ppc/kernel/entry.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/kernel/entry.S b/arch/ppc/kernel/entry.S
index 5f3a5d068a5c..fcd830a292e2 100644
--- a/arch/ppc/kernel/entry.S
+++ b/arch/ppc/kernel/entry.S
@@ -647,7 +647,7 @@ user_exc_return: /* r10 contains MSR_KERNEL here */
647 /* Check current_thread_info()->flags */ 647 /* Check current_thread_info()->flags */
648 rlwinm r9,r1,0,0,18 648 rlwinm r9,r1,0,0,18
649 lwz r9,TI_FLAGS(r9) 649 lwz r9,TI_FLAGS(r9)
650 andi. r0,r9,(_TIF_SIGPENDING|_TIF_RESTORE_SIGMASK|_TIF_NEED_RESCHED) 650 andi. r0,r9,_TIF_USER_WORK_MASK
651 bne do_work 651 bne do_work
652 652
653restore_user: 653restore_user:
@@ -898,7 +898,7 @@ recheck:
898 lwz r9,TI_FLAGS(r9) 898 lwz r9,TI_FLAGS(r9)
899 andi. r0,r9,_TIF_NEED_RESCHED 899 andi. r0,r9,_TIF_NEED_RESCHED
900 bne- do_resched 900 bne- do_resched
901 andi. r0,r9,_TIF_SIGPENDING 901 andi. r0,r9,_TIF_USER_WORK_MASK
902 beq restore_user 902 beq restore_user
903do_user_signal: /* r10 contains MSR_KERNEL here */ 903do_user_signal: /* r10 contains MSR_KERNEL here */
904 ori r10,r10,MSR_EE 904 ori r10,r10,MSR_EE