diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-02-19 10:38:43 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-02-20 15:52:04 -0500 |
| commit | f28f0c23576662fb293defe9b1884d5a6e1bd85c (patch) | |
| tree | c648cb81828ef0e904af839690ab308abc66ead7 /arch/x86/include/asm | |
| parent | ea499fec48dd771bd92984337fcb57ed4c787e69 (diff) | |
x86: Move some signal-handling definitions to a common header
There are some definitions which are duplicated between
kernel/signal.c and ia32/ia32_signal.c; move them to a common header
file.
Rather than adding stuff to existing header files which contain data
structures, create a new header file; hence the slightly odd name
("all the good ones were taken.")
Note: nothing relied on signal_fault() being defined in
<asm/ptrace.h>.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/include/asm')
| -rw-r--r-- | arch/x86/include/asm/ptrace.h | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/sighandling.h | 19 |
2 files changed, 19 insertions, 1 deletions
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h index 35664547125b..dcfde52979c3 100644 --- a/arch/x86/include/asm/ptrace.h +++ b/arch/x86/include/asm/ptrace.h | |||
| @@ -145,7 +145,6 @@ extern unsigned long | |||
| 145 | convert_ip_to_linear(struct task_struct *child, struct pt_regs *regs); | 145 | convert_ip_to_linear(struct task_struct *child, struct pt_regs *regs); |
| 146 | extern void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, | 146 | extern void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, |
| 147 | int error_code, int si_code); | 147 | int error_code, int si_code); |
| 148 | void signal_fault(struct pt_regs *regs, void __user *frame, char *where); | ||
| 149 | 148 | ||
| 150 | extern long syscall_trace_enter(struct pt_regs *); | 149 | extern long syscall_trace_enter(struct pt_regs *); |
| 151 | extern void syscall_trace_leave(struct pt_regs *); | 150 | extern void syscall_trace_leave(struct pt_regs *); |
diff --git a/arch/x86/include/asm/sighandling.h b/arch/x86/include/asm/sighandling.h new file mode 100644 index 000000000000..843e299e120e --- /dev/null +++ b/arch/x86/include/asm/sighandling.h | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | #ifndef _ASM_X86_SIGHANDLING_H | ||
| 2 | #define _ASM_X86_SIGHANDLING_H | ||
| 3 | |||
| 4 | #include <linux/compiler.h> | ||
| 5 | #include <linux/ptrace.h> | ||
| 6 | #include <linux/signal.h> | ||
| 7 | |||
| 8 | #include <asm/processor-flags.h> | ||
| 9 | |||
| 10 | #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) | ||
| 11 | |||
| 12 | #define __FIX_EFLAGS (X86_EFLAGS_AC | X86_EFLAGS_OF | \ | ||
| 13 | X86_EFLAGS_DF | X86_EFLAGS_TF | X86_EFLAGS_SF | \ | ||
| 14 | X86_EFLAGS_ZF | X86_EFLAGS_AF | X86_EFLAGS_PF | \ | ||
| 15 | X86_EFLAGS_CF) | ||
| 16 | |||
| 17 | void signal_fault(struct pt_regs *regs, void __user *frame, char *where); | ||
| 18 | |||
| 19 | #endif /* _ASM_X86_SIGHANDLING_H */ | ||
