From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 16 Oct 2012 03:43:51 +0000 (+1100)
Subject: sparc: fixup for conversion to generic execve
X-Git-Tag: next-20121016~1
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8b09066eda035d33e55de29d50d231406e58ab14;p=karo-tx-linux.git

sparc: fixup for conversion to generic execve

Fixes these errors:

arch/sparc/kernel/head_64.o: In function `sys64_execve':
(.text+0x1f58): relocation truncated to fit: R_SPARC_WDISP19 against symbol `sys_execve' defined in .text section in fs/built-in.o
arch/sparc/kernel/head_64.o: In function `sys32_execve':
(.text+0x1f64): relocation truncated to fit: R_SPARC_WDISP19 against symbol `compat_sys_execve' defined in .text section in fs/built-in.o

Dictated-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---

diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
index 4bae09677b48..f667cdfd0d4a 100644
--- a/arch/sparc/kernel/syscalls.S
+++ b/arch/sparc/kernel/syscalls.S
@@ -2,15 +2,19 @@
 	 * environment settings are the same as the calling processes.
 	 */
 sys64_execve:
-	ba,pt	%xcc,sys_execve
-	 flushw
+	flushw
+	mov	%o7, %l5
+	call	sys_execve
+	 mov	%l5, %o7
 
 #ifdef CONFIG_COMPAT
 sunos_execv:
 	mov	%g0, %o2
 sys32_execve:
-	ba,pt	%xcc,compat_sys_execve
-	 flushw
+	flushw
+	mov	%o7, %l5
+	call	compat_sys_execve
+	 mov	%l5, %o7
 #endif
 
 	.align	32