Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1

[linux-2.6.git] / arch / sparc / kernel / entry.S

diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index b448166..831f540 100644 (file)
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -8,7 +8,6 @@
  * Copyright (C) 1997 Anton Blanchard (anton@progsoc.uts.edu.au)
  */
 
-#include <linux/config.h>
 #include <linux/errno.h>
 
 #include <asm/head.h>
@@ -17,7 +16,7 @@
 #include <asm/kgdb.h>
 #include <asm/contregs.h>
 #include <asm/ptrace.h>
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/psr.h>
 #include <asm/vaddrs.h>
 #include <asm/memreg.h>
@@ -33,13 +32,12 @@
 #include <asm/mxcc.h>
 #include <asm/thread_info.h>
 #include <asm/param.h>
+#include <asm/unistd.h>
 
 #include <asm/asmmacro.h>
 
 #define curptr      g6
 
-#define NR_SYSCALLS 284      /* Each OS is different... */
-
 /* These are just handy. */
 #define _SV    save    %sp, -STACKFRAME_SZ, %sp
 #define _RS     restore 
@@ -1276,62 +1274,6 @@ sys_sigstack:
        call    do_sys_sigstack
         mov    %l5, %o7
 
-       .align  4
-       .globl  sys_sigpause
-sys_sigpause:
-       /* Note: %o0 already has correct value... */
-       call    do_sigpause
-        add    %sp, STACKFRAME_SZ, %o1
-
-       ld      [%curptr + TI_FLAGS], %l5
-       andcc   %l5, _TIF_SYSCALL_TRACE, %g0
-       be      1f
-        nop
-
-       call    syscall_trace
-        nop
-
-1:
-       /* We are returning to a signal handler. */
-       RESTORE_ALL
-
-       .align  4
-       .globl  sys_sigsuspend
-sys_sigsuspend:
-       call    do_sigsuspend
-        add    %sp, STACKFRAME_SZ, %o0
-
-       ld      [%curptr + TI_FLAGS], %l5
-       andcc   %l5, _TIF_SYSCALL_TRACE, %g0
-       be      1f
-        nop
-
-       call    syscall_trace
-        nop
-
-1:
-       /* We are returning to a signal handler. */
-       RESTORE_ALL
-
-       .align  4
-       .globl  sys_rt_sigsuspend
-sys_rt_sigsuspend:
-       /* Note: %o0, %o1 already have correct value... */
-       call    do_rt_sigsuspend
-        add    %sp, STACKFRAME_SZ, %o2
-
-       ld      [%curptr + TI_FLAGS], %l5
-       andcc   %l5, _TIF_SYSCALL_TRACE, %g0
-       be      1f
-        nop
-
-       call    syscall_trace
-        nop
-
-1:
-       /* We are returning to a signal handler. */
-       RESTORE_ALL
-
        .align  4
        .globl  sys_sigreturn
 sys_sigreturn: