diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-25 21:20:05 -0500 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 15:09:22 -0500 |
| commit | 92a3ce4a1e0047215aa0a0b30cc333bd32b866a8 (patch) | |
| tree | 998edfb4fd30e0be9cc353c6d7f4381f8c5f5a09 /include | |
| parent | 6883da8c6c15e85e7750c94be49ea156ed341c05 (diff) | |
consolidate declarations of k_sigaction
Only alpha and sparc are unusual - they have ka_restorer in it.
And nobody needs that exposed to userland.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/signal.h | 7 | ||||
| -rw-r--r-- | include/uapi/asm-generic/signal.h | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/include/linux/signal.h b/include/linux/signal.h index ed1e71f1aac..01451a156ff 100644 --- a/include/linux/signal.h +++ b/include/linux/signal.h @@ -249,6 +249,13 @@ extern void __set_current_blocked(const sigset_t *); extern int show_unhandled_signals; extern int sigsuspend(sigset_t *); +struct k_sigaction { + struct sigaction sa; +#ifdef __ARCH_HAS_KA_RESTORER + __sigrestore_t ka_restorer; +#endif +}; + extern int get_signal_to_deliver(siginfo_t *info, struct k_sigaction *return_ka, struct pt_regs *regs, void *cookie); extern void signal_delivered(int sig, siginfo_t *info, struct k_sigaction *ka, struct pt_regs *regs, int stepping); extern void exit_signals(struct task_struct *tsk); diff --git a/include/uapi/asm-generic/signal.h b/include/uapi/asm-generic/signal.h index 6fae30fd16a..21e59f36c61 100644 --- a/include/uapi/asm-generic/signal.h +++ b/include/uapi/asm-generic/signal.h @@ -102,10 +102,6 @@ struct sigaction { sigset_t sa_mask; /* mask last for extensibility */ }; -struct k_sigaction { - struct sigaction sa; -}; - typedef struct sigaltstack { void __user *ss_sp; int ss_flags; |