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>
This commit is contained in:
parent
6883da8c6c
commit
92a3ce4a1e
|
@ -28,9 +28,6 @@ struct sigaction {
|
|||
sigset_t sa_mask; /* mask last for extensibility */
|
||||
};
|
||||
|
||||
struct k_sigaction {
|
||||
struct sigaction sa;
|
||||
__sigrestore_t ka_restorer;
|
||||
};
|
||||
#define __ARCH_HAS_KA_RESTORER
|
||||
#include <asm/sigcontext.h>
|
||||
#endif
|
||||
|
|
|
@ -30,9 +30,5 @@ struct sigaction {
|
|||
sigset_t sa_mask; /* mask last for extensibility */
|
||||
};
|
||||
|
||||
struct k_sigaction {
|
||||
struct sigaction sa;
|
||||
};
|
||||
|
||||
#include <asm/sigcontext.h>
|
||||
#endif
|
||||
|
|
|
@ -30,10 +30,6 @@ struct sigaction {
|
|||
sigset_t sa_mask; /* mask last for extensibility */
|
||||
};
|
||||
|
||||
struct k_sigaction {
|
||||
struct sigaction sa;
|
||||
};
|
||||
|
||||
#include <asm/sigcontext.h>
|
||||
#undef __HAVE_ARCH_SIG_BITOPS
|
||||
|
||||
|
|
|
@ -30,9 +30,6 @@ struct sigaction {
|
|||
sigset_t sa_mask; /* mask last for extensibility */
|
||||
};
|
||||
|
||||
struct k_sigaction {
|
||||
struct sigaction sa;
|
||||
};
|
||||
#include <asm/sigcontext.h>
|
||||
|
||||
#endif
|
||||
|
|
|
@ -30,10 +30,6 @@ struct sigaction {
|
|||
sigset_t sa_mask; /* mask last for extensibility */
|
||||
};
|
||||
|
||||
struct k_sigaction {
|
||||
struct sigaction sa;
|
||||
};
|
||||
|
||||
#include <asm/sigcontext.h>
|
||||
#undef __HAVE_ARCH_SIG_BITOPS
|
||||
|
||||
|
|
|
@ -32,10 +32,6 @@ struct sigaction {
|
|||
sigset_t sa_mask; /* mask last for extensibility */
|
||||
};
|
||||
|
||||
struct k_sigaction {
|
||||
struct sigaction sa;
|
||||
};
|
||||
|
||||
# include <asm/sigcontext.h>
|
||||
|
||||
# endif /* !__ASSEMBLY__ */
|
||||
|
|
|
@ -23,9 +23,6 @@ struct sigaction {
|
|||
sigset_t sa_mask; /* mask last for extensibility */
|
||||
};
|
||||
|
||||
struct k_sigaction {
|
||||
struct sigaction sa;
|
||||
};
|
||||
#include <asm/sigcontext.h>
|
||||
|
||||
#undef __HAVE_ARCH_SIG_BITOPS
|
||||
|
|
|
@ -30,9 +30,6 @@ struct sigaction {
|
|||
sigset_t sa_mask; /* mask last for extensibility */
|
||||
};
|
||||
|
||||
struct k_sigaction {
|
||||
struct sigaction sa;
|
||||
};
|
||||
#include <asm/sigcontext.h>
|
||||
|
||||
#ifndef CONFIG_CPU_HAS_NO_BITFIELDS
|
||||
|
|
|
@ -102,10 +102,6 @@ struct sigaction {
|
|||
sigset_t sa_mask;
|
||||
};
|
||||
|
||||
struct k_sigaction {
|
||||
struct sigaction sa;
|
||||
};
|
||||
|
||||
/* IRIX compatible stack_t */
|
||||
typedef struct sigaltstack {
|
||||
void __user *ss_sp;
|
||||
|
|
|
@ -40,9 +40,6 @@ struct sigaction {
|
|||
sigset_t sa_mask; /* mask last for extensibility */
|
||||
};
|
||||
|
||||
struct k_sigaction {
|
||||
struct sigaction sa;
|
||||
};
|
||||
#include <asm/sigcontext.h>
|
||||
|
||||
#endif /* _ASM_SIGNAL_H */
|
||||
|
|
|
@ -30,10 +30,6 @@ struct sigaction {
|
|||
sigset_t sa_mask; /* mask last for extensibility */
|
||||
};
|
||||
|
||||
struct k_sigaction {
|
||||
struct sigaction sa;
|
||||
};
|
||||
|
||||
#include <asm/sigcontext.h>
|
||||
|
||||
#endif /* !__ASSEMBLY */
|
||||
|
|
|
@ -104,10 +104,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;
|
||||
|
|
|
@ -35,8 +35,4 @@ struct sigaction {
|
|||
sigset_t sa_mask; /* mask last for extensibility */
|
||||
};
|
||||
|
||||
struct k_sigaction {
|
||||
struct sigaction sa;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
@ -21,10 +21,7 @@
|
|||
*/
|
||||
#define SA_STATIC_ALLOC 0x8000
|
||||
|
||||
struct k_sigaction {
|
||||
struct __new_sigaction sa;
|
||||
void __user *ka_restorer;
|
||||
};
|
||||
#define __ARCH_HAS_KA_RESTORER
|
||||
|
||||
#endif /* !(__ASSEMBLY__) */
|
||||
#endif /* !(__SPARC_SIGNAL_H) */
|
||||
|
|
|
@ -46,11 +46,6 @@ struct sigaction {
|
|||
sigset_t sa_mask; /* mask last for extensibility */
|
||||
};
|
||||
|
||||
struct k_sigaction {
|
||||
struct sigaction sa;
|
||||
};
|
||||
|
||||
#else /* __i386__ */
|
||||
#endif /* !__i386__ */
|
||||
#include <asm/sigcontext.h>
|
||||
|
||||
|
|
|
@ -122,10 +122,6 @@ struct sigaction {
|
|||
sigset_t sa_mask; /* mask last for extensibility */
|
||||
};
|
||||
|
||||
struct k_sigaction {
|
||||
struct sigaction sa;
|
||||
};
|
||||
|
||||
#endif /* !__i386__ */
|
||||
|
||||
typedef struct sigaltstack {
|
||||
|
|
|
@ -22,10 +22,6 @@ struct sigaction {
|
|||
sigset_t sa_mask; /* mask last for extensibility */
|
||||
};
|
||||
|
||||
struct k_sigaction {
|
||||
struct sigaction sa;
|
||||
};
|
||||
|
||||
#include <asm/sigcontext.h>
|
||||
|
||||
#endif /* __ASSEMBLY__ */
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue