diff options
author | Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> | 2008-11-21 20:36:41 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-11-23 04:50:57 -0500 |
commit | 5c9b3a0c7b8be3cdef3d7418f0a49127e7cdc998 (patch) | |
tree | b72e5fdfb7881c8f977a0d795c76f5df3feb2ae8 /arch | |
parent | 3ddd972d970fdabbe6515aa2f95e0ef2c8df903d (diff) |
x86: signal: cosmetic unification of including headers
Impact: cleanup
Make the headers portion of signal_32.c and signal_64.c the same.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/signal_32.c | 27 | ||||
-rw-r--r-- | arch/x86/kernel/signal_64.c | 7 |
2 files changed, 21 insertions, 13 deletions
diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c index c2aabeba27a5..0ff8d8750a7d 100644 --- a/arch/x86/kernel/signal_32.c +++ b/arch/x86/kernel/signal_32.c | |||
@@ -4,29 +4,32 @@ | |||
4 | * 1997-11-28 Modified for POSIX.1b signals by Richard Henderson | 4 | * 1997-11-28 Modified for POSIX.1b signals by Richard Henderson |
5 | * 2000-06-20 Pentium III FXSR, SSE support by Gareth Hughes | 5 | * 2000-06-20 Pentium III FXSR, SSE support by Gareth Hughes |
6 | */ | 6 | */ |
7 | #include <linux/list.h> | ||
8 | 7 | ||
9 | #include <linux/personality.h> | 8 | #include <linux/sched.h> |
10 | #include <linux/binfmts.h> | 9 | #include <linux/mm.h> |
11 | #include <linux/suspend.h> | 10 | #include <linux/smp.h> |
12 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
13 | #include <linux/ptrace.h> | ||
14 | #include <linux/signal.h> | 12 | #include <linux/signal.h> |
15 | #include <linux/stddef.h> | ||
16 | #include <linux/unistd.h> | ||
17 | #include <linux/errno.h> | 13 | #include <linux/errno.h> |
18 | #include <linux/sched.h> | ||
19 | #include <linux/wait.h> | 14 | #include <linux/wait.h> |
15 | #include <linux/ptrace.h> | ||
20 | #include <linux/tracehook.h> | 16 | #include <linux/tracehook.h> |
21 | #include <linux/elf.h> | 17 | #include <linux/unistd.h> |
22 | #include <linux/smp.h> | 18 | #include <linux/stddef.h> |
23 | #include <linux/mm.h> | 19 | #include <linux/personality.h> |
20 | #include <linux/uaccess.h> | ||
24 | 21 | ||
25 | #include <asm/processor.h> | 22 | #include <asm/processor.h> |
26 | #include <asm/ucontext.h> | 23 | #include <asm/ucontext.h> |
27 | #include <asm/uaccess.h> | ||
28 | #include <asm/i387.h> | 24 | #include <asm/i387.h> |
29 | #include <asm/vdso.h> | 25 | #include <asm/vdso.h> |
26 | |||
27 | #ifdef CONFIG_X86_64 | ||
28 | #include <asm/proto.h> | ||
29 | #include <asm/ia32_unistd.h> | ||
30 | #include <asm/mce.h> | ||
31 | #endif /* CONFIG_X86_64 */ | ||
32 | |||
30 | #include <asm/syscall.h> | 33 | #include <asm/syscall.h> |
31 | #include <asm/syscalls.h> | 34 | #include <asm/syscalls.h> |
32 | 35 | ||
diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c index 3d54d366ccb2..c52244ac19fc 100644 --- a/arch/x86/kernel/signal_64.c +++ b/arch/x86/kernel/signal_64.c | |||
@@ -19,17 +19,22 @@ | |||
19 | #include <linux/unistd.h> | 19 | #include <linux/unistd.h> |
20 | #include <linux/stddef.h> | 20 | #include <linux/stddef.h> |
21 | #include <linux/personality.h> | 21 | #include <linux/personality.h> |
22 | #include <linux/compiler.h> | ||
23 | #include <linux/uaccess.h> | 22 | #include <linux/uaccess.h> |
24 | 23 | ||
25 | #include <asm/processor.h> | 24 | #include <asm/processor.h> |
26 | #include <asm/ucontext.h> | 25 | #include <asm/ucontext.h> |
27 | #include <asm/i387.h> | 26 | #include <asm/i387.h> |
27 | #include <asm/vdso.h> | ||
28 | |||
29 | #ifdef CONFIG_X86_64 | ||
28 | #include <asm/proto.h> | 30 | #include <asm/proto.h> |
29 | #include <asm/ia32_unistd.h> | 31 | #include <asm/ia32_unistd.h> |
30 | #include <asm/mce.h> | 32 | #include <asm/mce.h> |
33 | #endif /* CONFIG_X86_64 */ | ||
34 | |||
31 | #include <asm/syscall.h> | 35 | #include <asm/syscall.h> |
32 | #include <asm/syscalls.h> | 36 | #include <asm/syscalls.h> |
37 | |||
33 | #include "sigframe.h" | 38 | #include "sigframe.h" |
34 | 39 | ||
35 | #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) | 40 | #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP))) |