summaryrefslogtreecommitdiff
path: root/include/asm-arm
diff options
context:
space:
mode:
authorAnton Altaparmakov <aia21@cantab.net>2005-05-05 00:08:35 +0100
committerAnton Altaparmakov <aia21@cantab.net>2005-05-05 00:08:35 +0100
commit36050271e6ec19390184e1a83470eb7e725cad65 (patch)
treeef2c84331d71890e9a68eb63d925d5545cbb4103 /include/asm-arm
parentd4b9ba7bf6f38cff55b5d95a0db7dd91311ce20a (diff)
parent1d42a0ecf478962e8aede355a0be41365c117ff0 (diff)
downloadlinux-next-36050271e6ec19390184e1a83470eb7e725cad65.tar.gz
Merge with /usr/src/ntfs-2.6.git
Diffstat (limited to 'include/asm-arm')
-rw-r--r--include/asm-arm/signal.h15
1 files changed, 1 insertions, 14 deletions
diff --git a/include/asm-arm/signal.h b/include/asm-arm/signal.h
index b860dc3c5dc7..46e69ae395af 100644
--- a/include/asm-arm/signal.h
+++ b/include/asm-arm/signal.h
@@ -117,20 +117,7 @@ typedef unsigned long sigset_t;
#define SA_IRQNOMASK 0x08000000
#endif
-#define SIG_BLOCK 0 /* for blocking signals */
-#define SIG_UNBLOCK 1 /* for unblocking signals */
-#define SIG_SETMASK 2 /* 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 old_sigaction {