Merge branch 'topic/snd_card_new-err' into topic/drop-l3

[cascardo/linux.git] / arch / alpha / kernel / entry.S

diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S
index 5fc61e2..aa2e50c 100644 (file)
--- a/arch/alpha/kernel/entry.S
+++ b/arch/alpha/kernel/entry.S
@@ -850,8 +850,9 @@ osf_getpriority:
 sys_getxuid:
        .prologue 0
        ldq     $2, TI_TASK($8)
-       ldl     $0, TASK_UID($2)
-       ldl     $1, TASK_EUID($2)
+       ldq     $3, TASK_CRED($2)
+       ldl     $0, CRED_UID($3)
+       ldl     $1, CRED_EUID($3)
        stq     $1, 80($sp)
        ret
 .end sys_getxuid
@@ -862,8 +863,9 @@ sys_getxuid:
 sys_getxgid:
        .prologue 0
        ldq     $2, TI_TASK($8)
-       ldl     $0, TASK_GID($2)
-       ldl     $1, TASK_EGID($2)
+       ldq     $3, TASK_CRED($2)
+       ldl     $0, CRED_GID($3)
+       ldl     $1, CRED_EGID($3)
        stq     $1, 80($sp)
        ret
 .end sys_getxgid
@@ -894,9 +896,9 @@ sys_getxpid:
 .end sys_getxpid
 
        .align  4
-       .globl  sys_pipe
-       .ent    sys_pipe
-sys_pipe:
+       .globl  sys_alpha_pipe
+       .ent    sys_alpha_pipe
+sys_alpha_pipe:
        lda     $sp, -16($sp)
        stq     $26, 0($sp)
        .prologue 0
@@ -914,7 +916,7 @@ sys_pipe:
        stq     $1, 80+16($sp)
 1:     lda     $sp, 16($sp)
        ret
-.end sys_pipe
+.end sys_alpha_pipe
 
        .align  4
        .globl  sys_execve