From: Paul Mackerras Date: Wed, 19 Oct 2005 23:24:18 +0000 (+1000) Subject: powerpc: Fix a branch-too-far link error for 32-bit targets X-Git-Tag: v2.6.15-rc1~59^2~146 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a4bcc95a3ad0ccba6d7b39442dfb81cc57bb7121;p=linux-2.6-omap-h63xx.git powerpc: Fix a branch-too-far link error for 32-bit targets Signed-off-by: Paul Mackerras --- diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S index 094eea6fbd6..fc9dded9ac0 100644 --- a/arch/powerpc/kernel/entry_32.S +++ b/arch/powerpc/kernel/entry_32.S @@ -633,7 +633,8 @@ sigreturn_exit: 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