diff options
author | Christoph Hellwig <hch@lst.de> | 2008-05-09 08:44:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-09 11:04:56 -0400 |
commit | 9b013c2820c409ff84871e55e407ec2181782773 (patch) | |
tree | a54c6df0d540daf3af0bc7d24e17077bb86a2e9b /arch/m32r | |
parent | 41d88d55b2891203e98d1dc0acab949ffd0af078 (diff) |
m32r: use generic sys_pipe
m32r can use the generic sys_pipe implementation.
The current sys_pipe implementation on m32r only differes from the
generic one by passing a lot of additional unused registers to sys_pipe.
Reviewed and tested by Hirokazu Takata.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Hirokazu Takata <takata@linux-m32r.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m32r')
-rw-r--r-- | arch/m32r/kernel/sys_m32r.c | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/arch/m32r/kernel/sys_m32r.c b/arch/m32r/kernel/sys_m32r.c index 319c79720b8a..305ac852bbed 100644 --- a/arch/m32r/kernel/sys_m32r.c +++ b/arch/m32r/kernel/sys_m32r.c | |||
@@ -76,29 +76,6 @@ asmlinkage int sys_tas(int __user *addr) | |||
76 | return oldval; | 76 | return oldval; |
77 | } | 77 | } |
78 | 78 | ||
79 | /* | ||
80 | * sys_pipe() is the normal C calling standard for creating | ||
81 | * a pipe. It's not the way Unix traditionally does this, though. | ||
82 | */ | ||
83 | asmlinkage int | ||
84 | sys_pipe(unsigned long r0, unsigned long r1, unsigned long r2, | ||
85 | unsigned long r3, unsigned long r4, unsigned long r5, | ||
86 | unsigned long r6, struct pt_regs regs) | ||
87 | { | ||
88 | int fd[2]; | ||
89 | int error; | ||
90 | |||
91 | error = do_pipe(fd); | ||
92 | if (!error) { | ||
93 | if (copy_to_user((void __user *)r0, fd, 2*sizeof(int))) { | ||
94 | sys_close(fd[0]); | ||
95 | sys_close(fd[1]); | ||
96 | error = -EFAULT; | ||
97 | } | ||
98 | } | ||
99 | return error; | ||
100 | } | ||
101 | |||
102 | asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, | 79 | asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, |
103 | unsigned long prot, unsigned long flags, | 80 | unsigned long prot, unsigned long flags, |
104 | unsigned long fd, unsigned long pgoff) | 81 | unsigned long fd, unsigned long pgoff) |