diff options
| author | Joe Perches <joe@perches.com> | 2008-03-09 12:35:00 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 17:40:58 +0200 |
| commit | e40c0fe6b0b5dd16aec3c0dad311d36b19d78fd9 (patch) | |
| tree | efdb83368f0818ff51555bdd70f6ec2c6b439318 | |
| parent | 537d916066f66de18dbca79adf82933cd12d2a36 (diff) | |
| download | kernel-crypto-e40c0fe6b0b5dd16aec3c0dad311d36b19d78fd9.tar.gz kernel-crypto-e40c0fe6b0b5dd16aec3c0dad311d36b19d78fd9.tar.xz kernel-crypto-e40c0fe6b0b5dd16aec3c0dad311d36b19d78fd9.zip | |
x86: cleanup duplicate includes
Signed-off-by: Joe Perches <joe@perches.com>
arch/x86/kernel/reboot.c | 1 -
include/asm-x86/elf.h | 5 ++---
include/asm-x86/posix_types.h | 8 +-------
include/asm-x86/processor.h | 3 +--
include/asm-x86/unistd.h | 8 +-------
5 files changed, 5 insertions(+), 20 deletions(-)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | arch/x86/kernel/reboot.c | 1 | ||||
| -rw-r--r-- | include/asm-x86/elf.h | 5 | ||||
| -rw-r--r-- | include/asm-x86/posix_types.h | 8 | ||||
| -rw-r--r-- | include/asm-x86/processor.h | 3 | ||||
| -rw-r--r-- | include/asm-x86/unistd.h | 8 |
5 files changed, 5 insertions, 20 deletions
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 484c4a80d38..66cd4afc1e5 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c @@ -1,5 +1,4 @@ #include <linux/module.h> -#include <linux/init.h> #include <linux/reboot.h> #include <linux/init.h> #include <linux/pm.h> diff --git a/include/asm-x86/elf.h b/include/asm-x86/elf.h index fb62f9941e3..77325646e2f 100644 --- a/include/asm-x86/elf.h +++ b/include/asm-x86/elf.h @@ -82,8 +82,9 @@ extern unsigned int vdso_enabled; #define elf_check_arch_ia32(x) \ (((x)->e_machine == EM_386) || ((x)->e_machine == EM_486)) -#ifdef CONFIG_X86_32 #include <asm/processor.h> + +#ifdef CONFIG_X86_32 #include <asm/system.h> /* for savesegment */ #include <asm/desc.h> @@ -135,8 +136,6 @@ extern unsigned int vdso_enabled; #else /* CONFIG_X86_32 */ -#include <asm/processor.h> - /* * This is used to ensure we don't load something for the wrong architecture. */ diff --git a/include/asm-x86/posix_types.h b/include/asm-x86/posix_types.h index bb7133dc155..fe312a5ba20 100644 --- a/include/asm-x86/posix_types.h +++ b/include/asm-x86/posix_types.h @@ -1,11 +1,5 @@ #ifdef __KERNEL__ -# ifdef CONFIG_X86_32 -# include "posix_types_32.h" -# else -# include "posix_types_64.h" -# endif -#else -# ifdef __i386__ +# if defined(CONFIG_X86_32) || defined(__i386__) # include "posix_types_32.h" # else # include "posix_types_64.h" diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h index d590da88c0d..cc0268395ea 100644 --- a/include/asm-x86/processor.h +++ b/include/asm-x86/processor.h @@ -3,8 +3,7 @@ #include <asm/processor-flags.h> -/* migration helpers, for KVM - will be removed in 2.6.25: */ -#include <asm/vm86.h> +/* migration helper, for KVM - will be removed in 2.6.25: */ #define Xgt_desc_struct desc_ptr /* Forward declaration, a strange C thing */ diff --git a/include/asm-x86/unistd.h b/include/asm-x86/unistd.h index 2a58ed3e51d..effc7ad8e12 100644 --- a/include/asm-x86/unistd.h +++ b/include/asm-x86/unistd.h @@ -1,11 +1,5 @@ #ifdef __KERNEL__ -# ifdef CONFIG_X86_32 -# include "unistd_32.h" -# else -# include "unistd_64.h" -# endif -#else -# ifdef __i386__ +# if defined(CONFIG_X86_32) || defined(__i386__) # include "unistd_32.h" # else # include "unistd_64.h" |