Skip to contentSkip to conversation

x86: kill sys32_pause

PATCH In review Christoph Hellwig 3 participants 4 messages Sep 1, 2008 – Sep 6, 2008 x86

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86: kill sys32_pause

It's just a duplicate of the native sys_pause.

arch/x86/ia32/sys_ia32.c +0 -9
Index: linux-2.6/arch/x86/ia32/sys_ia32.c
===================================================================
@@ -556,15 +556,6 @@ asmlinkage long sys32_rt_sigqueueinfo(in
 	return ret;
 }
 
-/* These are here just in case some old ia32 binary calls it. */
-asmlinkage long sys32_pause(void)
-{
-	current->state = TASK_INTERRUPTIBLE;
-	schedule();
-	return -ERESTARTNOHAND;
-}
-
-
 #ifdef CONFIG_SYSCTL_SYSCALL
 struct sysctl_ia32 {
 	unsigned int	name;
arch/ia64/ia32/ia32_entry.S +1 -1
Index: linux-2.6/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 */
arch/ia64/ia32/sys_ia32.c +0 -8
Index: linux-2.6/arch/ia64/ia32/sys_ia32.c
===================================================================
@@ -1795,14 +1795,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;
#1 lore raw
Quoted 1 line · Christoph Hellwig

It's just a duplicate of the native sys_pause.

Oops, this also includes ia64. Should be safe anyway :)

Quoted 54 lines

Index: linux-2.6/arch/x86/ia32/sys_ia32.c
=================================> --- linux-2.6.orig/arch/x86/ia32/sys_ia32.c 2008-08-22 12:48:34.000000000 -0300
+++ linux-2.6/arch/x86/ia32/sys_ia32.c 2008-08-22 12:48:40.000000000 -0300

arch/x86/ia32/sys_ia32.c +0 -9
@@ -556,15 +556,6 @@ asmlinkage long sys32_rt_sigqueueinfo(in
 	return ret;
 }
 
-/* These are here just in case some old ia32 binary calls it. */
-asmlinkage long sys32_pause(void)
-{
-	current->state = TASK_INTERRUPTIBLE;
-	schedule();
-	return -ERESTARTNOHAND;
-}
-
-
 #ifdef CONFIG_SYSCTL_SYSCALL
 struct sysctl_ia32 {
 	unsigned int	name;

Index: linux-2.6/arch/ia64/ia32/ia32_entry.S
=================================> --- linux-2.6.orig/arch/ia64/ia32/ia32_entry.S 2008-08-22 12:49:25.000000000 -0300
+++ linux-2.6/arch/ia64/ia32/ia32_entry.S 2008-08-22 12:49:29.000000000 -0300

arch/ia64/ia32/ia32_entry.S +1 -1
@@ -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 */

Index: linux-2.6/arch/ia64/ia32/sys_ia32.c
=================================> --- linux-2.6.orig/arch/ia64/ia32/sys_ia32.c 2008-08-22 12:49:33.000000000 -0300
+++ linux-2.6/arch/ia64/ia32/sys_ia32.c 2008-08-22 12:49:37.000000000 -0300

arch/ia64/ia32/sys_ia32.c +0 -9
@@ -1795,14 +1795,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;
--
Quoted 4 lines

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

---end quoted text---

#2 lore raw

PATCH 1/1 x86: kill sys32_pause

In reply to Christoph Hellwig

It's an unused duplicate of the generic sys_pause.

(now without the b0rked ia64 bits, sorry)

arch/x86/ia32/sys_ia32.c +0 -9
Index: linux-2.6/arch/x86/ia32/sys_ia32.c
===================================================================
@@ -556,15 +556,6 @@ asmlinkage long sys32_rt_sigqueueinfo(in
 	return ret;
 }
 
-/* These are here just in case some old ia32 binary calls it. */
-asmlinkage long sys32_pause(void)
-{
-	current->state = TASK_INTERRUPTIBLE;
-	schedule();
-	return -ERESTARTNOHAND;
-}
-
-
 #ifdef CONFIG_SYSCTL_SYSCALL
 struct sysctl_ia32 {
 	unsigned int	name;
Applied
#3 lore raw
Quoted 5 lines · Christoph Hellwig

It's an unused duplicate of the generic sys_pause.

(now without the b0rked ia64 bits, sorry)

applied to tip/x86/cleanups - thanks Christoph. I'm curious, how did you find it, some automation - or old-fashioned code reading?

Ingo