diff options
author | Cheng Renquan <crquan@gmail.com> | 2009-01-14 04:01:33 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2009-03-27 14:43:58 -0400 |
commit | 10f303ae1e5e77a9f7cb053e6329906afb132c67 (patch) | |
tree | 720e7d57a46da824f217ab0dc5b2682814aadfa4 | |
parent | 723be1f30046a46471b00106ebef9d8c832f12e9 (diff) |
do_pipe cleanup: drop its last user in arch/alpha/
The last user of do_pipe is in arch/alpha/, after replacing it with
do_pipe_flags, the do_pipe can be totally dropped.
Signed-off-by: Cheng Renquan <crquan@gmail.com>
Acked-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | arch/alpha/kernel/entry.S | 3 | ||||
-rw-r--r-- | arch/alpha/kernel/osf_sys.c | 2 | ||||
-rw-r--r-- | fs/pipe.c | 5 | ||||
-rw-r--r-- | include/linux/fs.h | 1 |
4 files changed, 2 insertions, 9 deletions
diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S index e4a54b615894..b45d913a51c3 100644 --- a/arch/alpha/kernel/entry.S +++ b/arch/alpha/kernel/entry.S | |||
@@ -903,8 +903,9 @@ sys_alpha_pipe: | |||
903 | stq $26, 0($sp) | 903 | stq $26, 0($sp) |
904 | .prologue 0 | 904 | .prologue 0 |
905 | 905 | ||
906 | mov $31, $17 | ||
906 | lda $16, 8($sp) | 907 | lda $16, 8($sp) |
907 | jsr $26, do_pipe | 908 | jsr $26, do_pipe_flags |
908 | 909 | ||
909 | ldq $26, 0($sp) | 910 | ldq $26, 0($sp) |
910 | bne $0, 1f | 911 | bne $0, 1f |
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index ae41f097864b..42ee05981e71 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c | |||
@@ -46,8 +46,6 @@ | |||
46 | #include <asm/hwrpb.h> | 46 | #include <asm/hwrpb.h> |
47 | #include <asm/processor.h> | 47 | #include <asm/processor.h> |
48 | 48 | ||
49 | extern int do_pipe(int *); | ||
50 | |||
51 | /* | 49 | /* |
52 | * Brk needs to return an error. Still support Linux's brk(0) query idiom, | 50 | * Brk needs to return an error. Still support Linux's brk(0) query idiom, |
53 | * which OSF programs just shouldn't be doing. We're still not quite | 51 | * which OSF programs just shouldn't be doing. We're still not quite |
@@ -1034,11 +1034,6 @@ int do_pipe_flags(int *fd, int flags) | |||
1034 | return error; | 1034 | return error; |
1035 | } | 1035 | } |
1036 | 1036 | ||
1037 | int do_pipe(int *fd) | ||
1038 | { | ||
1039 | return do_pipe_flags(fd, 0); | ||
1040 | } | ||
1041 | |||
1042 | /* | 1037 | /* |
1043 | * sys_pipe() is the normal C calling standard for creating | 1038 | * sys_pipe() is the normal C calling standard for creating |
1044 | * a pipe. It's not the way Unix traditionally does this, though. | 1039 | * a pipe. It's not the way Unix traditionally does this, though. |
diff --git a/include/linux/fs.h b/include/linux/fs.h index 92734c0012e6..51de83bd8a87 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h | |||
@@ -1881,7 +1881,6 @@ static inline void allow_write_access(struct file *file) | |||
1881 | if (file) | 1881 | if (file) |
1882 | atomic_inc(&file->f_path.dentry->d_inode->i_writecount); | 1882 | atomic_inc(&file->f_path.dentry->d_inode->i_writecount); |
1883 | } | 1883 | } |
1884 | extern int do_pipe(int *); | ||
1885 | extern int do_pipe_flags(int *, int); | 1884 | extern int do_pipe_flags(int *, int); |
1886 | extern struct file *create_read_pipe(struct file *f, int flags); | 1885 | extern struct file *create_read_pipe(struct file *f, int flags); |
1887 | extern struct file *create_write_pipe(int flags); | 1886 | extern struct file *create_write_pipe(int flags); |