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/sparc/include | |
parent | 92a3ce4a1e0047215aa0a0b30cc333bd32b866a8 (diff) |
consolidate kernel-side struct sigaction declarations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/sparc/include')
-rw-r--r-- | arch/sparc/include/asm/signal.h | 1 | ||||
-rw-r--r-- | arch/sparc/include/uapi/asm/signal.h | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/signal.h b/arch/sparc/include/asm/signal.h index e1881856a55c..c33ce3f2ba84 100644 --- a/arch/sparc/include/asm/signal.h +++ b/arch/sparc/include/asm/signal.h | |||
@@ -22,6 +22,7 @@ | |||
22 | #define SA_STATIC_ALLOC 0x8000 | 22 | #define SA_STATIC_ALLOC 0x8000 |
23 | 23 | ||
24 | #define __ARCH_HAS_KA_RESTORER | 24 | #define __ARCH_HAS_KA_RESTORER |
25 | #define __ARCH_HAS_SA_RESTORER | ||
25 | 26 | ||
26 | #endif /* !(__ASSEMBLY__) */ | 27 | #endif /* !(__ASSEMBLY__) */ |
27 | #endif /* !(__SPARC_SIGNAL_H) */ | 28 | #endif /* !(__SPARC_SIGNAL_H) */ |
diff --git a/arch/sparc/include/uapi/asm/signal.h b/arch/sparc/include/uapi/asm/signal.h index c4ffd6c97106..284836f0b7dc 100644 --- a/arch/sparc/include/uapi/asm/signal.h +++ b/arch/sparc/include/uapi/asm/signal.h | |||
@@ -153,12 +153,14 @@ struct sigstack { | |||
153 | 153 | ||
154 | #include <asm-generic/signal-defs.h> | 154 | #include <asm-generic/signal-defs.h> |
155 | 155 | ||
156 | #ifndef __KERNEL__ | ||
156 | struct __new_sigaction { | 157 | struct __new_sigaction { |
157 | __sighandler_t sa_handler; | 158 | __sighandler_t sa_handler; |
158 | unsigned long sa_flags; | 159 | unsigned long sa_flags; |
159 | __sigrestore_t sa_restorer; /* not used by Linux/SPARC yet */ | 160 | __sigrestore_t sa_restorer; /* not used by Linux/SPARC yet */ |
160 | __new_sigset_t sa_mask; | 161 | __new_sigset_t sa_mask; |
161 | }; | 162 | }; |
163 | #endif | ||
162 | 164 | ||
163 | struct __old_sigaction { | 165 | struct __old_sigaction { |
164 | __sighandler_t sa_handler; | 166 | __sighandler_t sa_handler; |