diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-05-09 18:24:09 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-05-09 18:24:09 -0400 |
| commit | 1f2ee6496b1f71e9d5aa2448745e65fbafdc3bd5 (patch) | |
| tree | 3f143311afca5e316afd06c2fc4f7d73b19cdcf0 /arch/sh | |
| parent | 5bf6c6e30d8b71d092e8830208e182d84b907fcd (diff) | |
| parent | da109897a142dd017172c0ce7abf0be8646f7109 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into fixes
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/kernel/sys_sh64.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/sh/kernel/sys_sh64.c b/arch/sh/kernel/sys_sh64.c index 578004d71e02..91fb8445a5a0 100644 --- a/arch/sh/kernel/sys_sh64.c +++ b/arch/sh/kernel/sys_sh64.c | |||
| @@ -31,23 +31,6 @@ | |||
| 31 | #include <asm/unistd.h> | 31 | #include <asm/unistd.h> |
| 32 | 32 | ||
| 33 | /* | 33 | /* |
| 34 | * sys_pipe() is the normal C calling standard for creating | ||
| 35 | * a pipe. It's not the way Unix traditionally does this, though. | ||
| 36 | */ | ||
| 37 | asmlinkage int sys_pipe(unsigned long * fildes) | ||
| 38 | { | ||
| 39 | int fd[2]; | ||
| 40 | int error; | ||
| 41 | |||
| 42 | error = do_pipe(fd); | ||
| 43 | if (!error) { | ||
| 44 | if (copy_to_user(fildes, fd, 2*sizeof(int))) | ||
| 45 | error = -EFAULT; | ||
| 46 | } | ||
| 47 | return error; | ||
| 48 | } | ||
| 49 | |||
| 50 | /* | ||
| 51 | * Do a system call from kernel instead of calling sys_execve so we | 34 | * Do a system call from kernel instead of calling sys_execve so we |
| 52 | * end up with proper pt_regs. | 35 | * end up with proper pt_regs. |
| 53 | */ | 36 | */ |