cris: kill sys_pipe implementation
The cris implementation of sys_pipe only differs from the generic one by taking the BKL before calling do_pipe which isn't not nessecary. Just kill the cris implementation and use the generic one. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
a8f43ee7e1
commit
41d88d55b2
|
@ -27,28 +27,6 @@
|
||||||
#include <asm/uaccess.h>
|
#include <asm/uaccess.h>
|
||||||
#include <asm/segment.h>
|
#include <asm/segment.h>
|
||||||
|
|
||||||
/*
|
|
||||||
* sys_pipe() is the normal C calling standard for creating
|
|
||||||
* a pipe. It's not the way Unix traditionally does this, though.
|
|
||||||
*/
|
|
||||||
asmlinkage int sys_pipe(unsigned long __user * fildes)
|
|
||||||
{
|
|
||||||
int fd[2];
|
|
||||||
int error;
|
|
||||||
|
|
||||||
lock_kernel();
|
|
||||||
error = do_pipe(fd);
|
|
||||||
unlock_kernel();
|
|
||||||
if (!error) {
|
|
||||||
if (copy_to_user(fildes, fd, 2*sizeof(int))) {
|
|
||||||
sys_close(fd[0]);
|
|
||||||
sys_close(fd[1]);
|
|
||||||
error = -EFAULT;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return error;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* common code for old and new mmaps */
|
/* common code for old and new mmaps */
|
||||||
static inline long
|
static inline long
|
||||||
do_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
|
do_mmap2(unsigned long addr, unsigned long len, unsigned long prot,
|
||||||
|
|
Loading…
Reference in New Issue