The patch titled
do_pipe(): drop its last user in arch/alpha/
has been removed from the -mm tree. Its filename was
do_pipe-drop-its-last-user-in-arch-alpha.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: do_pipe(): drop its last user in arch/alpha/
From: Cheng Renquan <crquan@xxxxxxxxx>
The last user of do_pipe is in arch/alpha/, after replacing it with
do_pipe_flags, the do_pipe can be removed.
Signed-off-by: Cheng Renquan <crquan@xxxxxxxxx>
Acked-by: Richard Henderson <rth@xxxxxxxxxxx>
Cc: Ivan Kokshaysky <ink@xxxxxxxxxxxxxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Cc: Jens Axboe <jens.axboe@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/alpha/kernel/entry.S | 3 ++-
arch/alpha/kernel/osf_sys.c | 2 +-
fs/pipe.c | 5 -----
include/linux/fs.h | 1 -
4 files changed, 3 insertions(+), 8 deletions(-)
diff -puN arch/alpha/kernel/entry.S~do_pipe-drop-its-last-user-in-arch-alpha arch/alpha/kernel/entry.S
--- a/arch/alpha/kernel/entry.S~do_pipe-drop-its-last-user-in-arch-alpha
+++ a/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 -puN arch/alpha/kernel/osf_sys.c~do_pipe-drop-its-last-user-in-arch-alpha arch/alpha/kernel/osf_sys.c
--- a/arch/alpha/kernel/osf_sys.c~do_pipe-drop-its-last-user-in-arch-alpha
+++ a/arch/alpha/kernel/osf_sys.c
@@ -46,7 +46,7 @@
#include <asm/hwrpb.h>
#include <asm/processor.h>
-extern int do_pipe(int *);
+extern int do_pipe_flags(int *, int);
/*
* Brk needs to return an error. Still support Linux's brk(0) query idiom,
diff -puN fs/pipe.c~do_pipe-drop-its-last-user-in-arch-alpha fs/pipe.c
--- a/fs/pipe.c~do_pipe-drop-its-last-user-in-arch-alpha
+++ a/fs/pipe.c
@@ -1035,11 +1035,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 -puN include/linux/fs.h~do_pipe-drop-its-last-user-in-arch-alpha include/linux/fs.h
--- a/include/linux/fs.h~do_pipe-drop-its-last-user-in-arch-alpha
+++ a/include/linux/fs.h
@@ -2047,7 +2047,6 @@ static inline void allow_write_access(st
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);
_
Patches currently in -mm which might be from crquan@xxxxxxxxx are
origin.patch
linux-next.patch
maintainers-add-the-missing-linux-alpha-port-mailling-list.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
