Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

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

diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index 624e2a6..887f6a1 100644 (file)
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -17,7 +17,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>
@@ -38,7 +38,7 @@
 
 #define curptr      g6
 
-#define NR_SYSCALLS 283      /* Each OS is different... */
+#define NR_SYSCALLS 300      /* Each OS is different... */
 
 /* These are just handy. */
 #define _SV    save    %sp, -STACKFRAME_SZ, %sp
@@ -1276,62 +1276,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:
@@ -1508,7 +1452,7 @@ syscall_is_too_hard:
        .globl  ret_sys_call
 ret_sys_call:
        ld      [%curptr + TI_FLAGS], %l6
-       cmp     %o0, -ENOIOCTLCMD
+       cmp     %o0, -ERESTART_RESTARTBLOCK
        ld      [%sp + STACKFRAME_SZ + PT_PSR], %g3
        set     PSR_C, %g2
        bgeu    1f
@@ -1587,7 +1531,7 @@ solaris_syscall:
 
        st      %o0, [%sp + STACKFRAME_SZ + PT_I0]
        set     PSR_C, %g2
-       cmp     %o0, -ENOIOCTLCMD
+       cmp     %o0, -ERESTART_RESTARTBLOCK
        bgeu    1f
         ld     [%sp + STACKFRAME_SZ + PT_PSR], %g3
 
@@ -1678,7 +1622,7 @@ bsd_is_too_hard:
 
        st      %o0, [%sp + STACKFRAME_SZ + PT_I0]
        set     PSR_C, %g2
-       cmp     %o0, -ENOIOCTLCMD
+       cmp     %o0, -ERESTART_RESTARTBLOCK
        bgeu    1f
         ld     [%sp + STACKFRAME_SZ + PT_PSR], %g3