patch-2.3.48 linux/include/asm-mips/signal.h

• Lines: 112
• Date: Thu Feb 24 22:52:30 2000
• Orig file: v2.3.47/linux/include/asm-mips/signal.h
• Orig date: Tue Oct 20 13:52:54 1998

diff -u --recursive --new-file v2.3.47/linux/include/asm-mips/signal.h linux/include/asm-mips/signal.h
@@ -1,13 +1,14 @@
-/* $Id: signal.h,v 1.4 1998/08/18 20:46:42 ralf Exp $
+/* $Id: signal.h,v 1.7 1999/09/28 22:27:17 ralf Exp $
  *
  * This file is subject to the terms and conditions of the GNU General Public
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1995, 1996, 1997, 1998 by Ralf Baechle
+ * Copyright (C) 1995, 1996, 1997, 1998, 1999 by Ralf Baechle
+ * Copyright (C) 1999 Silicon Graphics, Inc.
  */
-#ifndef __ASM_MIPS_SIGNAL_H
-#define __ASM_MIPS_SIGNAL_H
+#ifndef _ASM_SIGNAL_H
+#define _ASM_SIGNAL_H
 
 #include <linux/types.h>
 
@@ -16,7 +17,7 @@
 #define _NSIG_WORDS	(_NSIG / _NSIG_BPW)
 
 typedef struct {
-	unsigned long sig[_NSIG_WORDS];
+	__u32 sig[_NSIG_WORDS];
 } sigset_t;
 
 typedef unsigned long old_sigset_t;		/* at least 32 bits */
@@ -74,16 +75,19 @@
  * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
  * Unix names RESETHAND and NODEFER respectively.
  */
-#define SA_STACK	0x00000001
-#define SA_RESETHAND	0x00000002
-#define SA_RESTART	0x00000004
+#define SA_ONSTACK	0x08000000
+#define SA_RESETHAND	0x80000000
+#define SA_RESTART	0x10000000
 #define SA_SIGINFO	0x00000008
-#define SA_NODEFER	0x00000010
+#define SA_NODEFER	0x40000000
 #define SA_NOCLDWAIT	0x00010000	/* Not supported yet */
-#define SA_NOCLDSTOP	0x00020000
+#define SA_NOCLDSTOP	0x00000001
 
 #define SA_NOMASK	SA_NODEFER
 #define SA_ONESHOT	SA_RESETHAND
+#define SA_INTERRUPT	0x20000000	/* dummy -- ignored */
+
+#define SA_RESTORER	0x04000000
 
 /* 
  * sigaltstack controls
@@ -95,18 +99,18 @@
 #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 a no-op, but left due to historical reasons. Use the
- * SA_RESTART flag to get restarting signals (which were the default long ago)
+ * SA_INTERRUPT is also used by the irq handling routines.
  * SA_SHIRQ flag is for shared interrupt support on PCI and EISA.
  */
-#define SA_INTERRUPT		0x01000000	/* interrupt handling */
-#define SA_SHIRQ		0x08000000
 #define SA_PROBE		SA_ONESHOT
 #define SA_SAMPLE_RANDOM	SA_RESTART
+#define SA_SHIRQ		0x02000000
+
 #endif /* __KERNEL__ */
 
 #define SIG_BLOCK	1	/* for blocking signals */
@@ -127,13 +131,12 @@
 	unsigned int	sa_flags;
 	__sighandler_t	sa_handler;
 	sigset_t	sa_mask;
-	int		sa_resv[2];	/* reserved */
+	void		(*sa_restorer)(void);
+	int		sa_resv[1];	/* reserved */
 };
 
-/* XXX use sa_rev for storing ka_restorer */
 struct k_sigaction {
 	struct sigaction sa;
-	void (*ka_restorer)(void);
 };
 
 /* IRIX compatible stack_t  */
@@ -145,9 +148,7 @@
 
 #ifdef __KERNEL__
 #include <asm/sigcontext.h>
-#endif
 
-#if defined (__KERNEL__) || defined (__USE_MISC)
 /*
  * The following break codes are or were in use for specific purposes in
  * other MIPS operating systems.  Linux/MIPS doesn't use all of them.  The
@@ -167,6 +168,7 @@
 #define BRK_NORLD	10	/* No rld found - not used by Linux/MIPS */
 #define _BRK_THREADBP	11	/* For threads, user bp (used by debuggers) */
 #define BRK_MULOVF	1023	/* Multiply overflow */
-#endif /* defined (__KERNEL__) || defined (__USE_MISC) */
 
-#endif /* !defined (__ASM_MIPS_SIGNAL_H) */
+#endif /* defined (__KERNEL__) */
+
+#endif /* _ASM_SIGNAL_H */