1 files changed, 4 insertions, 5 deletions

diff --git a/arch/ppc/kernel/entry.S b/arch/ppc/kernel/entry.S
index 68fc61221776..f044edbb454f 100644
--- a/arch/ppc/kernel/entry.S
+++ b/arch/ppc/kernel/entry.S
@@ -200,9 +200,8 @@ _GLOBAL(DoSyscall)
         bl      do_show_syscall
 #endif /* SHOW_SYSCALLS */
         rlwinm  r10,r1,0,0,18   /* current_thread_info() */
-        lwz     r11,TI_LOCAL_FLAGS(r10)
-        rlwinm  r11,r11,0,~_TIFL_FORCE_NOERROR
-        stw     r11,TI_LOCAL_FLAGS(r10)
+        li      r11,0
+        stb     r11,TI_SC_NOERR(r10)
         lwz     r11,TI_FLAGS(r10)
         andi.   r11,r11,_TIF_SYSCALL_T_OR_A
         bne-    syscall_dotrace
@@ -227,8 +226,8 @@ ret_from_syscall:
         cmplw   0,r3,r11
         rlwinm  r12,r1,0,0,18   /* current_thread_info() */
         blt+    30f
-        lwz     r11,TI_LOCAL_FLAGS(r12)
-        andi.   r11,r11,_TIFL_FORCE_NOERROR
+        lbz     r11,TI_SC_NOERR(r12)
+        cmpwi   r11,0
         bne     30f
         neg     r3,r3
         lwz     r10,_CCR(r1)    /* Set SO bit in CR */