Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8394b3a8 authored Aug 24, 2008 by David S. Miller

sparc64: Kill duplicated sys_pause() implementation.



sys32_pause() is identical to the generically provided
sys_pause() in kernel/signal.c

Noticed by Christoph Hellwig.

Signed-off-by: David S. Miller <davem@davemloft.net>

parent fe06ccaa

arch/sparc64/kernel/sys_sparc32.c

+0 −8

Original line number	Diff line number	Diff line
		@@ -575,14 +575,6 @@ asmlinkage long sys32_settimeofday(struct compat_timeval __user *tv,
		return do_sys_settimeofday(tv ? &kts : NULL, tz ? &ktz : NULL);
		}

		/* These are here just in case some old sparc32 binary calls it. */
		asmlinkage long sys32_pause(void)
		{
		current->state = TASK_INTERRUPTIBLE;
		schedule();
		return -ERESTARTNOHAND;
		}

		asmlinkage compat_ssize_t sys32_pread64(unsigned int fd,
		char __user *ubuf,
		compat_size_t count,

arch/sparc64/kernel/systbls.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ sys_call_table32:
		/10/ .word sys_unlink, sunos_execv, sys_chdir, sys_chown16, sys32_mknod
		/15/ .word sys_chmod, sys_lchown16, sparc_brk, sys32_perfctr, sys32_lseek
		/20/ .word sys_getpid, sys_capget, sys_capset, sys_setuid16, sys_getuid16
		/25/ .word sys32_vmsplice, compat_sys_ptrace, sys_alarm, sys32_sigaltstack, sys32_pause
		/25/ .word sys32_vmsplice, compat_sys_ptrace, sys_alarm, sys32_sigaltstack, sys_pause
		/30/ .word compat_sys_utime, sys_lchown, sys_fchown, sys32_access, sys32_nice
		.word sys_chown, sys_sync, sys32_kill, compat_sys_newstat, sys32_sendfile
		/40/ .word compat_sys_newlstat, sys_dup, sys_pipe, compat_sys_times, sys_getuid