diff options
author | Christoph Hellwig <hch@lst.de> | 2008-08-31 21:23:30 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-09-15 14:08:39 -0400 |
commit | d6c93adbeb98c56e19f7df37633566b39fbcd4c9 (patch) | |
tree | 98ea6c811f7a586603a757e6d7e28d492aa85215 /arch | |
parent | 549e8152de8039506f69c677a4546e5427aa6ae7 (diff) |
powerpc: Use sys_pause for 32-bit pause entry point
sys32_pause is a useless copy of the generic sys_pause.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/powerpc/include/asm/systbl.h | 2 | ||||
-rw-r--r-- | arch/powerpc/kernel/sys_ppc32.c | 8 |
2 files changed, 1 insertions, 9 deletions
diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h index f6cc7a43b4fa..803def236654 100644 --- a/arch/powerpc/include/asm/systbl.h +++ b/arch/powerpc/include/asm/systbl.h | |||
@@ -32,7 +32,7 @@ COMPAT_SYS_SPU(stime) | |||
32 | COMPAT_SYS(ptrace) | 32 | COMPAT_SYS(ptrace) |
33 | SYSCALL_SPU(alarm) | 33 | SYSCALL_SPU(alarm) |
34 | OLDSYS(fstat) | 34 | OLDSYS(fstat) |
35 | COMPAT_SYS(pause) | 35 | SYSCALL(pause) |
36 | COMPAT_SYS(utime) | 36 | COMPAT_SYS(utime) |
37 | SYSCALL(ni_syscall) | 37 | SYSCALL(ni_syscall) |
38 | SYSCALL(ni_syscall) | 38 | SYSCALL(ni_syscall) |
diff --git a/arch/powerpc/kernel/sys_ppc32.c b/arch/powerpc/kernel/sys_ppc32.c index d98634c76060..ff7de7b0797e 100644 --- a/arch/powerpc/kernel/sys_ppc32.c +++ b/arch/powerpc/kernel/sys_ppc32.c | |||
@@ -107,14 +107,6 @@ asmlinkage long compat_sys_sysfs(u32 option, u32 arg1, u32 arg2) | |||
107 | return sys_sysfs((int)option, arg1, arg2); | 107 | return sys_sysfs((int)option, arg1, arg2); |
108 | } | 108 | } |
109 | 109 | ||
110 | asmlinkage long compat_sys_pause(void) | ||
111 | { | ||
112 | current->state = TASK_INTERRUPTIBLE; | ||
113 | schedule(); | ||
114 | |||
115 | return -ERESTARTNOHAND; | ||
116 | } | ||
117 | |||
118 | static inline long get_ts32(struct timespec *o, struct compat_timeval __user *i) | 110 | static inline long get_ts32(struct timespec *o, struct compat_timeval __user *i) |
119 | { | 111 | { |
120 | long usec; | 112 | long usec; |