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>
This commit is contained in:
parent
537d916066
commit
e40c0fe6b0
5 changed files with 5 additions and 20 deletions
|
@ -1,5 +1,4 @@
|
||||||
#include <linux/module.h>
|
#include <linux/module.h>
|
||||||
#include <linux/init.h>
|
|
||||||
#include <linux/reboot.h>
|
#include <linux/reboot.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/pm.h>
|
#include <linux/pm.h>
|
||||||
|
|
|
@ -82,8 +82,9 @@ extern unsigned int vdso_enabled;
|
||||||
#define elf_check_arch_ia32(x) \
|
#define elf_check_arch_ia32(x) \
|
||||||
(((x)->e_machine == EM_386) || ((x)->e_machine == EM_486))
|
(((x)->e_machine == EM_386) || ((x)->e_machine == EM_486))
|
||||||
|
|
||||||
#ifdef CONFIG_X86_32
|
|
||||||
#include <asm/processor.h>
|
#include <asm/processor.h>
|
||||||
|
|
||||||
|
#ifdef CONFIG_X86_32
|
||||||
#include <asm/system.h> /* for savesegment */
|
#include <asm/system.h> /* for savesegment */
|
||||||
#include <asm/desc.h>
|
#include <asm/desc.h>
|
||||||
|
|
||||||
|
@ -135,8 +136,6 @@ extern unsigned int vdso_enabled;
|
||||||
|
|
||||||
#else /* CONFIG_X86_32 */
|
#else /* CONFIG_X86_32 */
|
||||||
|
|
||||||
#include <asm/processor.h>
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* This is used to ensure we don't load something for the wrong architecture.
|
* This is used to ensure we don't load something for the wrong architecture.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -1,11 +1,5 @@
|
||||||
#ifdef __KERNEL__
|
#ifdef __KERNEL__
|
||||||
# ifdef CONFIG_X86_32
|
# if defined(CONFIG_X86_32) || defined(__i386__)
|
||||||
# include "posix_types_32.h"
|
|
||||||
# else
|
|
||||||
# include "posix_types_64.h"
|
|
||||||
# endif
|
|
||||||
#else
|
|
||||||
# ifdef __i386__
|
|
||||||
# include "posix_types_32.h"
|
# include "posix_types_32.h"
|
||||||
# else
|
# else
|
||||||
# include "posix_types_64.h"
|
# include "posix_types_64.h"
|
||||||
|
|
|
@ -3,8 +3,7 @@
|
||||||
|
|
||||||
#include <asm/processor-flags.h>
|
#include <asm/processor-flags.h>
|
||||||
|
|
||||||
/* migration helpers, for KVM - will be removed in 2.6.25: */
|
/* migration helper, for KVM - will be removed in 2.6.25: */
|
||||||
#include <asm/vm86.h>
|
|
||||||
#define Xgt_desc_struct desc_ptr
|
#define Xgt_desc_struct desc_ptr
|
||||||
|
|
||||||
/* Forward declaration, a strange C thing */
|
/* Forward declaration, a strange C thing */
|
||||||
|
|
|
@ -1,11 +1,5 @@
|
||||||
#ifdef __KERNEL__
|
#ifdef __KERNEL__
|
||||||
# ifdef CONFIG_X86_32
|
# if defined(CONFIG_X86_32) || defined(__i386__)
|
||||||
# include "unistd_32.h"
|
|
||||||
# else
|
|
||||||
# include "unistd_64.h"
|
|
||||||
# endif
|
|
||||||
#else
|
|
||||||
# ifdef __i386__
|
|
||||||
# include "unistd_32.h"
|
# include "unistd_32.h"
|
||||||
# else
|
# else
|
||||||
# include "unistd_64.h"
|
# include "unistd_64.h"
|
||||||
|
|
Reference in a new issue