diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-25 22:24:19 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 15:09:22 -0500 |
commit | 574c4866e33d648520a8bd5bf6f573ea6e554e88 (patch) | |
tree | 354c1c42819cba60481a854281f1e130c7cec260 /arch/mips | |
parent | 92a3ce4a1e0047215aa0a0b30cc333bd32b866a8 (diff) |
consolidate kernel-side struct sigaction declarations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/mips')
-rw-r--r-- | arch/mips/include/asm/signal.h | 2 | ||||
-rw-r--r-- | arch/mips/include/uapi/asm/signal.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/include/asm/signal.h b/arch/mips/include/asm/signal.h index cf4a08062d1d..197f6367c201 100644 --- a/arch/mips/include/asm/signal.h +++ b/arch/mips/include/asm/signal.h | |||
@@ -21,4 +21,6 @@ | |||
21 | #include <asm/sigcontext.h> | 21 | #include <asm/sigcontext.h> |
22 | #include <asm/siginfo.h> | 22 | #include <asm/siginfo.h> |
23 | 23 | ||
24 | #define __ARCH_HAS_ODD_SIGACTION | ||
25 | |||
24 | #endif /* _ASM_SIGNAL_H */ | 26 | #endif /* _ASM_SIGNAL_H */ |
diff --git a/arch/mips/include/uapi/asm/signal.h b/arch/mips/include/uapi/asm/signal.h index 3c85fa07b3d3..6783c887a678 100644 --- a/arch/mips/include/uapi/asm/signal.h +++ b/arch/mips/include/uapi/asm/signal.h | |||
@@ -96,11 +96,13 @@ typedef unsigned long old_sigset_t; /* at least 32 bits */ | |||
96 | 96 | ||
97 | #include <asm-generic/signal-defs.h> | 97 | #include <asm-generic/signal-defs.h> |
98 | 98 | ||
99 | #ifndef __KERNEL__ | ||
99 | struct sigaction { | 100 | struct sigaction { |
100 | unsigned int sa_flags; | 101 | unsigned int sa_flags; |
101 | __sighandler_t sa_handler; | 102 | __sighandler_t sa_handler; |
102 | sigset_t sa_mask; | 103 | sigset_t sa_mask; |
103 | }; | 104 | }; |
105 | #endif | ||
104 | 106 | ||
105 | /* IRIX compatible stack_t */ | 107 | /* IRIX compatible stack_t */ |
106 | typedef struct sigaltstack { | 108 | typedef struct sigaltstack { |