diff --git a/[refs] b/[refs] index 6593323c573f..e7b8048ca27f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8433137ea9143bb3a2bc18a3407b5a130fdb868 +refs/heads/master: af2667f7efa64706c78b8bee1398726fc86b42ad diff --git a/trunk/arch/mips/kernel/linux32.c b/trunk/arch/mips/kernel/linux32.c index e00e5f6e7fdd..396592467da8 100644 --- a/trunk/arch/mips/kernel/linux32.c +++ b/trunk/arch/mips/kernel/linux32.c @@ -161,12 +161,6 @@ asmlinkage int sys32_execve(nabi_no_regargs struct pt_regs regs) return error; } -asmlinkage int -sys32_waitpid(compat_pid_t pid, unsigned int *stat_addr, int options) -{ - return compat_sys_wait4(pid, stat_addr, options, NULL); -} - asmlinkage long sysn32_waitid(int which, compat_pid_t pid, siginfo_t __user *uinfo, int options,