commit a4bcc95a3ad0ccba6d7b39442dfb81cc57bb7121
author Paul Mackerras <paulus@samba.org> Thu Oct 20 09:24:18 2005 +1000
committer Paul Mackerras <paulus@samba.org> Thu Oct 20 09:24:18 2005 +1000
tree 89ac96fd0859dbf624beff2b90e3b980c1d5abea
parent f2783c15007468c14972e2617db51e9affc7fad9

powerpc: Fix a branch-too-far link error for 32-bit targets

Signed-off-by: Paul Mackerras <paulus@samba.org>

arch/powerpc/kernel/entry_32.S

diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 094eea6..fc9dded 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -633,7 +633,8 @@
 	rlwinm	r12,r1,0,0,18	/* current_thread_info() */
 	lwz	r9,TI_FLAGS(r12)
 	andi.	r0,r9,_TIF_SYSCALL_T_OR_A
-	bnel-	do_syscall_trace_leave
+	beq+	ret_from_except_full
+	bl	do_syscall_trace_leave
 	/* fall through */
 
 	.globl	ret_from_except_full