From: Denys Vlasenko <dvlasenk@redhat.com>
Date: Wed, 25 Mar 2015 14:22:49 +0000 (+0100)
Subject: Move sparc64 get_scno() code where it belongs
X-Git-Tag: v4.11~539
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b6ef71b6f487062689f320161ce7c1966dd2ac65;p=strace

Move sparc64 get_scno() code where it belongs

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
---

diff --git a/linux/sparc/get_scno.c b/linux/sparc/get_scno.c
index 0e59a280..b190b6c5 100644
--- a/linux/sparc/get_scno.c
+++ b/linux/sparc/get_scno.c
@@ -1,21 +1 @@
-#ifdef SPARC64
-/* Retrieve the syscall trap instruction. */
-unsigned long trap;
-errno = 0;
-trap = ptrace(PTRACE_PEEKTEXT, tcp->pid, (char *)sparc_regs.tpc, 0);
-if (errno)
-	return -1;
-trap >>= 32;
-switch (trap) {
-case 0x91d02010:
-	/* Linux/SPARC syscall trap. */
-	update_personality(tcp, 0);
-	break;
-case 0x91d0206d:
-	/* Linux/SPARC64 syscall trap. */
-	update_personality(tcp, 1);
-	break;
-}
-#endif
-
 scno = sparc_regs.u_regs[U_REG_G1];
diff --git a/linux/sparc64/get_scno.c b/linux/sparc64/get_scno.c
index dbb0afa9..b92366e9 100644
--- a/linux/sparc64/get_scno.c
+++ b/linux/sparc64/get_scno.c
@@ -1 +1,19 @@
-#include "sparc/get_scno.c"
+/* Retrieve the syscall trap instruction. */
+unsigned long trap;
+errno = 0;
+trap = ptrace(PTRACE_PEEKTEXT, tcp->pid, (char *)sparc_regs.tpc, 0);
+if (errno)
+	return -1;
+trap >>= 32;
+switch (trap) {
+case 0x91d02010:
+	/* Linux/SPARC syscall trap. */
+	update_personality(tcp, 0);
+	break;
+case 0x91d0206d:
+	/* Linux/SPARC64 syscall trap. */
+	update_personality(tcp, 1);
+	break;
+}
+
+scno = sparc_regs.u_regs[U_REG_G1];