From fa37da839d5c25dfdcea85a35c8e2d8fa8e40633 Mon Sep 17 00:00:00 2001
From: Cheng Renquan <crquan@gmail.com>
Date: Wed, 14 Jan 2009 17:01:33 +0800
Subject: [PATCH] --- yaml --- r: 135929 b: refs/heads/master c:
 10f303ae1e5e77a9f7cb053e6329906afb132c67 h: refs/heads/master i:   135927:
 964139fdb03789bdef6a29ce696bf6e95d4839bb v: v3

---
 [refs]                            | 2 +-
 trunk/arch/alpha/kernel/entry.S   | 3 ++-
 trunk/arch/alpha/kernel/osf_sys.c | 2 --
 trunk/fs/pipe.c                   | 5 -----
 trunk/include/linux/fs.h          | 1 -
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index c7bbd72eb7ad..73553b53d695 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 723be1f30046a46471b00106ebef9d8c832f12e9
+refs/heads/master: 10f303ae1e5e77a9f7cb053e6329906afb132c67
diff --git a/trunk/arch/alpha/kernel/entry.S b/trunk/arch/alpha/kernel/entry.S
index e4a54b615894..b45d913a51c3 100644
--- a/trunk/arch/alpha/kernel/entry.S
+++ b/trunk/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
diff --git a/trunk/arch/alpha/kernel/osf_sys.c b/trunk/arch/alpha/kernel/osf_sys.c
index ae41f097864b..42ee05981e71 100644
--- a/trunk/arch/alpha/kernel/osf_sys.c
+++ b/trunk/arch/alpha/kernel/osf_sys.c
@@ -46,8 +46,6 @@
 #include <asm/hwrpb.h>
 #include <asm/processor.h>
 
-extern int do_pipe(int *);
-
 /*
  * Brk needs to return an error.  Still support Linux's brk(0) query idiom,
  * which OSF programs just shouldn't be doing.  We're still not quite
diff --git a/trunk/fs/pipe.c b/trunk/fs/pipe.c
index 14f502b89cf5..df3719562fc1 100644
--- a/trunk/fs/pipe.c
+++ b/trunk/fs/pipe.c
@@ -1034,11 +1034,6 @@ int do_pipe_flags(int *fd, int flags)
 	return error;
 }
 
-int do_pipe(int *fd)
-{
-	return do_pipe_flags(fd, 0);
-}
-
 /*
  * sys_pipe() is the normal C calling standard for creating
  * a pipe. It's not the way Unix traditionally does this, though.
diff --git a/trunk/include/linux/fs.h b/trunk/include/linux/fs.h
index 92734c0012e6..51de83bd8a87 100644
--- a/trunk/include/linux/fs.h
+++ b/trunk/include/linux/fs.h
@@ -1881,7 +1881,6 @@ static inline void allow_write_access(struct file *file)
 	if (file)
 		atomic_inc(&file->f_path.dentry->d_inode->i_writecount);
 }
-extern int do_pipe(int *);
 extern int do_pipe_flags(int *, int);
 extern struct file *create_read_pipe(struct file *f, int flags);
 extern struct file *create_write_pipe(int flags);