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/kernel | |
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/kernel')
-rw-r--r-- | arch/x86/kernel/signal.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c index 46a01bdc27e..c432dc0e65f 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c | |||
@@ -10,10 +10,8 @@ | |||
10 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
11 | #include <linux/smp.h> | 11 | #include <linux/smp.h> |
12 | #include <linux/kernel.h> | 12 | #include <linux/kernel.h> |
13 | #include <linux/signal.h> | ||
14 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
15 | #include <linux/wait.h> | 14 | #include <linux/wait.h> |
16 | #include <linux/ptrace.h> | ||
17 | #include <linux/tracehook.h> | 15 | #include <linux/tracehook.h> |
18 | #include <linux/unistd.h> | 16 | #include <linux/unistd.h> |
19 | #include <linux/stddef.h> | 17 | #include <linux/stddef.h> |
@@ -26,6 +24,7 @@ | |||
26 | #include <asm/i387.h> | 24 | #include <asm/i387.h> |
27 | #include <asm/vdso.h> | 25 | #include <asm/vdso.h> |
28 | #include <asm/mce.h> | 26 | #include <asm/mce.h> |
27 | #include <asm/sighandling.h> | ||
29 | 28 | ||
30 | #ifdef CONFIG_X86_64 | 29 | #ifdef CONFIG_X86_64 |
31 | #include <asm/proto.h> | 30 | #include <asm/proto.h> |
@@ -37,13 +36,6 @@ | |||
37 | 36 | ||
38 | #include <asm/sigframe.h> | 37 | #include <asm/sigframe.h> |
39 | 38 | ||
40 | #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) | ||
41 | |||
42 | #define __FIX_EFLAGS (X86_EFLAGS_AC | X86_EFLAGS_OF | \ | ||
43 | X86_EFLAGS_DF | X86_EFLAGS_TF | X86_EFLAGS_SF | \ | ||
44 | X86_EFLAGS_ZF | X86_EFLAGS_AF | X86_EFLAGS_PF | \ | ||
45 | X86_EFLAGS_CF) | ||
46 | |||
47 | #ifdef CONFIG_X86_32 | 39 | #ifdef CONFIG_X86_32 |
48 | # define FIX_EFLAGS (__FIX_EFLAGS | X86_EFLAGS_RF) | 40 | # define FIX_EFLAGS (__FIX_EFLAGS | X86_EFLAGS_RF) |
49 | #else | 41 | #else |