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 0e59a2808bc8a315ae2329a4ebc3995076f04c93..b190b6c574a19712149eb7c5e2f0cf786336fff0 100644 (file)
--- 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 dbb0afa92beb56dc6acf217eb98ef21bf49eb029..b92366e9d7b319860d3929c2ed9e26397ab02b46 100644 (file)
--- 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];