diff options
author | Christoph Hellwig <hch@lst.de> | 2008-09-01 12:16:52 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2008-10-17 15:38:20 -0400 |
commit | 9f3541ed2cc5e74a4ace7052701055dedbe46938 (patch) | |
tree | c1ac93724e5cc3197952f44c0c72ab85ee830361 /arch/ia64 | |
parent | 26e9a397774a0e94efbb8a0bf4a952c28d808cab (diff) |
[IA64] remove sys32_pause
It's just a duplicate of the native sys_pause, which we can use after
defining __ARCH_WANT_SYS_PAUSE.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/ia32/ia32_entry.S | 2 | ||||
-rw-r--r-- | arch/ia64/ia32/sys_ia32.c | 8 | ||||
-rw-r--r-- | arch/ia64/include/asm/unistd.h | 1 |
3 files changed, 2 insertions, 9 deletions
diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S index 53505bb04771..fa9844305610 100644 --- a/arch/ia64/ia32/ia32_entry.S +++ b/arch/ia64/ia32/ia32_entry.S | |||
@@ -202,7 +202,7 @@ ia32_syscall_table: | |||
202 | data8 sys32_ptrace | 202 | data8 sys32_ptrace |
203 | data8 sys32_alarm | 203 | data8 sys32_alarm |
204 | data8 sys_ni_syscall | 204 | data8 sys_ni_syscall |
205 | data8 sys32_pause | 205 | data8 sys_pause |
206 | data8 compat_sys_utime /* 30 */ | 206 | data8 compat_sys_utime /* 30 */ |
207 | data8 sys_ni_syscall /* old stty syscall holder */ | 207 | data8 sys_ni_syscall /* old stty syscall holder */ |
208 | data8 sys_ni_syscall /* old gtty syscall holder */ | 208 | data8 sys_ni_syscall /* old gtty syscall holder */ |
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c index f4430bb4bbdc..0fd06b471bc1 100644 --- a/arch/ia64/ia32/sys_ia32.c +++ b/arch/ia64/ia32/sys_ia32.c | |||
@@ -1704,14 +1704,6 @@ out: | |||
1704 | } | 1704 | } |
1705 | 1705 | ||
1706 | asmlinkage int | 1706 | asmlinkage int |
1707 | sys32_pause (void) | ||
1708 | { | ||
1709 | current->state = TASK_INTERRUPTIBLE; | ||
1710 | schedule(); | ||
1711 | return -ERESTARTNOHAND; | ||
1712 | } | ||
1713 | |||
1714 | asmlinkage int | ||
1715 | sys32_msync (unsigned int start, unsigned int len, int flags) | 1707 | sys32_msync (unsigned int start, unsigned int len, int flags) |
1716 | { | 1708 | { |
1717 | unsigned int addr; | 1709 | unsigned int addr; |
diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h index d535833aab5e..f791576355ad 100644 --- a/arch/ia64/include/asm/unistd.h +++ b/arch/ia64/include/asm/unistd.h | |||
@@ -337,6 +337,7 @@ | |||
337 | # define __ARCH_WANT_SYS_NICE | 337 | # define __ARCH_WANT_SYS_NICE |
338 | # define __ARCH_WANT_SYS_OLD_GETRLIMIT | 338 | # define __ARCH_WANT_SYS_OLD_GETRLIMIT |
339 | # define __ARCH_WANT_SYS_OLDUMOUNT | 339 | # define __ARCH_WANT_SYS_OLDUMOUNT |
340 | # define __ARCH_WANT_SYS_PAUSE | ||
340 | # define __ARCH_WANT_SYS_SIGPENDING | 341 | # define __ARCH_WANT_SYS_SIGPENDING |
341 | # define __ARCH_WANT_SYS_SIGPROCMASK | 342 | # define __ARCH_WANT_SYS_SIGPROCMASK |
342 | # define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND | 343 | # define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND |