aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Filippov <jcmvbkbc@gmail.com>2013-01-07 23:48:42 -0500
committerChris Zankel <chris@zankel.net>2013-02-23 22:12:52 -0500
commit5d9f36b94db82fb630acdc38ac380af4cf107f8e (patch)
treee4e0c4132d59c0804b2c0dc28aea16e8cc457014
parente969161b669a8b79b9218f12117a3173d972a44c (diff)
xtensa: pull signal definitions from signal-defs.h
This fixes the following build error in the current linux-next: include/linux/signal.h:261:2: error: unknown type name '__sigrestore_t' make[2]: *** [arch/xtensa/kernel/asm-offsets.s] Error 1 make[1]: *** [prepare0] Error 2 make: *** [sub-make] Error 2 that appeared after 32dae82 'consolidate kernel-side struct sigaction declarations' Signed-off-by: Max Filippov <jcmvbkbc@gmail.com> Signed-off-by: Chris Zankel <chris@zankel.net>
-rw-r--r--arch/xtensa/include/uapi/asm/signal.h11
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/xtensa/include/uapi/asm/signal.h b/arch/xtensa/include/uapi/asm/signal.h
index dacf716dd3e0..586756ee267a 100644
--- a/arch/xtensa/include/uapi/asm/signal.h
+++ b/arch/xtensa/include/uapi/asm/signal.h
@@ -102,16 +102,7 @@ typedef struct {
102 102
103#ifndef __ASSEMBLY__ 103#ifndef __ASSEMBLY__
104 104
105#define SIG_BLOCK 0 /* for blocking signals */ 105#include <asm-generic/signal-defs.h>
106#define SIG_UNBLOCK 1 /* for unblocking signals */
107#define SIG_SETMASK 2 /* for setting the signal mask */
108
109/* Type of a signal handler. */
110typedef void (*__sighandler_t)(int);
111
112#define SIG_DFL ((__sighandler_t)0) /* default signal handling */
113#define SIG_IGN ((__sighandler_t)1) /* ignore signal */
114#define SIG_ERR ((__sighandler_t)-1) /* error return from signal */
115 106
116#ifndef __KERNEL__ 107#ifndef __KERNEL__
117 108