manual update from upstream:

[safe/jmp/linux-2.6] / include / asm-mips / signal.h

diff --git a/include/asm-mips/signal.h b/include/asm-mips/signal.h
index d813567..8ca539e 100644 (file)
--- a/include/asm-mips/signal.h
+++ b/include/asm-mips/signal.h
@@ -98,6 +98,25 @@ typedef unsigned long old_sigset_t;          /* at least 32 bits */
 #define MINSIGSTKSZ    2048
 #define SIGSTKSZ       8192
 
+#ifdef __KERNEL__
+
+/*
+ * These values of sa_flags are used only by the kernel as part of the
+ * irq handling routines.
+ *
+ * SA_INTERRUPT is also used by the irq handling routines.
+ * SA_SHIRQ flag is for shared interrupt support on PCI and EISA.
+ */
+#define SA_SAMPLE_RANDOM       SA_RESTART
+
+#ifdef CONFIG_TRAD_SIGNALS
+#define sig_uses_siginfo(ka)   ((ka)->sa.sa_flags & SA_SIGINFO)
+#else
+#define sig_uses_siginfo(ka)   (1)
+#endif
+
+#endif /* __KERNEL__ */
+
 #define SIG_BLOCK      1       /* for blocking signals */
 #define SIG_UNBLOCK    2       /* for unblocking signals */
 #define SIG_SETMASK    3       /* for setting the signal mask */
@@ -105,7 +124,8 @@ typedef unsigned long old_sigset_t;         /* at least 32 bits */
                                   set only the low 32 bit of the sigset.  */
 
 /* Type of a signal handler.  */
-typedef void (*__sighandler_t)(int);
+typedef void __signalfn_t(int);
+typedef __signalfn_t __user *__sighandler_t;
 
 /* Fake signal functions */
 #define SIG_DFL        ((__sighandler_t)0)     /* default signal handling */