diff options
| author | Christoph Hellwig <hch@lst.de> | 2008-09-01 18:16:52 +0200 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-10-17 12:38:20 -0700 |
| commit | 9f3541ed2cc5e74a4ace7052701055dedbe46938 (patch) | |
| tree | c1ac93724e5cc3197952f44c0c72ab85ee830361 /arch/ia64 | |
| parent | 26e9a397774a0e94efbb8a0bf4a952c28d808cab (diff) | |
| download | linux-3.10-9f3541ed2cc5e74a4ace7052701055dedbe46938.tar.gz linux-3.10-9f3541ed2cc5e74a4ace7052701055dedbe46938.tar.bz2 linux-3.10-9f3541ed2cc5e74a4ace7052701055dedbe46938.zip | |
[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 53505bb0477..fa984430561 100644 --- a/arch/ia64/ia32/ia32_entry.S +++ b/arch/ia64/ia32/ia32_entry.S @@ -202,7 +202,7 @@ ia32_syscall_table: data8 sys32_ptrace data8 sys32_alarm data8 sys_ni_syscall - data8 sys32_pause + data8 sys_pause data8 compat_sys_utime /* 30 */ data8 sys_ni_syscall /* old stty syscall holder */ 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 f4430bb4bbd..0fd06b471bc 100644 --- a/arch/ia64/ia32/sys_ia32.c +++ b/arch/ia64/ia32/sys_ia32.c @@ -1704,14 +1704,6 @@ out: } asmlinkage int -sys32_pause (void) -{ - current->state = TASK_INTERRUPTIBLE; - schedule(); - return -ERESTARTNOHAND; -} - -asmlinkage int sys32_msync (unsigned int start, unsigned int len, int flags) { unsigned int addr; diff --git a/arch/ia64/include/asm/unistd.h b/arch/ia64/include/asm/unistd.h index d535833aab5..f791576355a 100644 --- a/arch/ia64/include/asm/unistd.h +++ b/arch/ia64/include/asm/unistd.h @@ -337,6 +337,7 @@ # define __ARCH_WANT_SYS_NICE # define __ARCH_WANT_SYS_OLD_GETRLIMIT # define __ARCH_WANT_SYS_OLDUMOUNT +# define __ARCH_WANT_SYS_PAUSE # define __ARCH_WANT_SYS_SIGPENDING # define __ARCH_WANT_SYS_SIGPROCMASK # define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND |