Merge branch 'for-2.6.30' into for-2.6.31

[pandora-kernel.git] / arch / alpha / kernel / entry.S

diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S
index e4a54b6..b45d913 100644 (file)
--- a/arch/alpha/kernel/entry.S
+++ b/arch/alpha/kernel/entry.S
@@ -903,8 +903,9 @@ sys_alpha_pipe:
        stq     $26, 0($sp)
        .prologue 0
 
+       mov     $31, $17
        lda     $16, 8($sp)
-       jsr     $26, do_pipe
+       jsr     $26, do_pipe_flags
 
        ldq     $26, 0($sp)
        bne     $0, 1f