Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S
index be17311..780cb93 100644 (file)
--- a/arch/alpha/kernel/entry.S
+++ b/arch/alpha/kernel/entry.S
@@ -5,7 +5,7 @@
  */
 
 #include <linux/config.h>
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 #include <asm/pal.h>
 #include <asm/errno.h>
@@ -196,6 +196,7 @@ entUna:
        stq     $26, 208($sp)
        stq     $27, 216($sp)
        stq     $28, 224($sp)
+       mov     $sp, $19
        stq     $gp, 232($sp)
        lda     $8, 0x3fff
        stq     $31, 248($sp)
@@ -873,22 +874,15 @@ sys_getxgid:
        .globl  sys_getxpid
        .ent    sys_getxpid
 sys_getxpid:
+       lda     $sp, -16($sp)
+       stq     $26, 0($sp)
        .prologue 0
-       ldq     $2, TI_TASK($8)
 
-       /* See linux/kernel/timer.c sys_getppid for discussion
-          about this loop.  */
-       ldq     $3, TASK_REAL_PARENT($2)
-1:     ldl     $1, TASK_TGID($3)
-#ifdef CONFIG_SMP
-       mov     $3, $4
-       mb
-       ldq     $3, TASK_REAL_PARENT($2)
-       cmpeq   $3, $4, $4
-       beq     $4, 1b
-#endif
-       stq     $1, 80($sp)
-       ldl     $0, TASK_TGID($2)
+       lda     $16, 96($sp)
+       jsr     $26, do_getxpid
+       ldq     $26, 0($sp)
+
+       lda     $sp, 16($sp)
        ret
 .end sys_getxpid
 
@@ -924,6 +918,24 @@ sys_ptrace:
        jmp     $31, do_sys_ptrace
 .end sys_ptrace
 
+       .align  4
+       .globl  sys_execve
+       .ent    sys_execve
+sys_execve:
+       .prologue 0
+       mov     $sp, $19
+       jmp     $31, do_sys_execve
+.end sys_execve
+
+       .align  4
+       .globl  osf_sigprocmask
+       .ent    osf_sigprocmask
+osf_sigprocmask:
+       .prologue 0
+       mov     $sp, $18
+       jmp     $31, do_osf_sigprocmask
+.end osf_sigprocmask
+
        .align  4
        .globl  alpha_ni_syscall
        .ent    alpha_ni_syscall