summaryrefslogtreecommitdiffstats
path: root/include/asm-alpha/signal.h
diff options
context:
space:
mode:
authorJames Bottomley <jejb@titanic.(none)>2005-05-20 22:27:44 +0200
committerJames Bottomley <jejb@titanic.(none)>2005-05-20 22:27:44 +0200
commitad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch)
treead434400f5ecaa33b433c8f830e40792d8d6c05c /include/asm-alpha/signal.h
parent[SCSI] remove Documentation/DocBook/scsidrivers.tmpl (diff)
parentLinux v2.6.12-rc4 (diff)
downloadlinux-ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672.tar.xz
linux-ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672.zip
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'include/asm-alpha/signal.h')
-rw-r--r--include/asm-alpha/signal.h25
1 files changed, 1 insertions, 24 deletions
diff --git a/include/asm-alpha/signal.h b/include/asm-alpha/signal.h
index 25f98bc5576f..1a2c52a056fb 100644
--- a/include/asm-alpha/signal.h
+++ b/include/asm-alpha/signal.h
@@ -109,34 +109,11 @@ typedef unsigned long sigset_t;
#define MINSIGSTKSZ 4096
#define SIGSTKSZ 16384
-
-#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 is for shared interrupt support on PCI and EISA.
- */
-#define SA_PROBE SA_ONESHOT
-#define SA_SAMPLE_RANDOM SA_RESTART
-#define SA_SHIRQ 0x40000000
-#endif
-
#define SIG_BLOCK 1 /* for blocking signals */
#define SIG_UNBLOCK 2 /* for unblocking signals */
#define SIG_SETMASK 3 /* for setting the signal mask */
-/* Type of a signal handler. */
-typedef void __signalfn_t(int);
-typedef __signalfn_t __user *__sighandler_t;
-
-typedef void __restorefn_t(void);
-typedef __restorefn_t __user *__sigrestore_t;
-
-#define SIG_DFL ((__sighandler_t)0) /* default signal handling */
-#define SIG_IGN ((__sighandler_t)1) /* ignore signal */
-#define SIG_ERR ((__sighandler_t)-1) /* error return from signal */
+#include <asm-generic/signal.h>
#ifdef __KERNEL__
struct osf_sigaction {