From: Paul Mackerras <paulus@samba.org>
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: firefly_0821_release~39876^2~203
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a4bcc95a3ad0ccba6d7b39442dfb81cc57bb7121;p=firefly-linux-kernel-4.4.55.git

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

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

diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index 094eea6fbd69..fc9dded9ac04 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