* Atsushi Nemoto <anemo@mba.ocn.ne.jp> [2006-02-19 00:06]:
> tbm> Done now, and tested on Cobalt.
> Looks good for me, except one point.
> Since do_signal() return void now, do_signal32 also should return void.
You're right, thanks. Ralf has done this in a separate commit so I've
attached a new patch rather than adding this to the last one. Also,
this one isn't as urgent and doesn't need to make 1.6.16 while the
other one does.
> Also, I think prototypes of do_signal() variant should be in
> asm/signal.h or so to avoid such mistake in the future, but this
> might be an another patch ...
Maybe you or Ralf can do that.
From: Martin Michlmayr <tbm@cyrius.com>
[PATCH] [MIPS] Make do_signal32 return void.
do_signal has been changed to return void since the "return value is
ignored everywhere". Convert do_signal32 accordingly.
Signed-off-by: Martin Michlmayr <tbm@cyrius.com>
---
--- a/arch/mips/kernel/signal32.c~ 2006-02-18 15:17:33.000000000 +0000
+++ b/arch/mips/kernel/signal32.c 2006-02-18 15:18:24.000000000 +0000
@@ -4,7 +4,7 @@
* for more details.
*
* Copyright (C) 1991, 1992 Linus Torvalds
- * Copyright (C) 1994 - 2000 Ralf Baechle
+ * Copyright (C) 1994 - 2000, 2006 Ralf Baechle
* Copyright (C) 1999, 2000 Silicon Graphics, Inc.
*/
#include <linux/cache.h>
@@ -800,7 +800,7 @@
return ret;
}
-int do_signal32(struct pt_regs *regs)
+void do_signal32(struct pt_regs *regs)
{
struct k_sigaction ka;
sigset_t *oldset;
@@ -813,7 +813,7 @@
* if so.
*/
if (!user_mode(regs))
- return 1;
+ return;
if (try_to_freeze())
goto no_signal;
@@ -866,8 +866,6 @@
clear_thread_flag(TIF_RESTORE_SIGMASK);
sigprocmask(SIG_SETMASK, ¤t->saved_sigmask, NULL);
}
-
- return 0;
}
asmlinkage int sys32_rt_sigaction(int sig, const struct sigaction32 *act,
--
Martin Michlmayr
http://www.cyrius.com/
|