Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e40c0fe6 authored by Joe Perches's avatar Joe Perches Committed by Ingo Molnar
Browse files

x86: cleanup duplicate includes 



Signed-off-by: default avatarJoe 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: default avatarIngo Molnar <mingo@elte.hu>
parent 537d9160

arch/x86/kernel/reboot.c

+0 −1
Original line number Diff line number Diff line 
#include <linux/module.h>

#include <linux/init.h>

#include <linux/reboot.h>

#include <linux/init.h>

#include <linux/pm.h>

include/asm-x86/elf.h

+2 −3
Original line number Diff line number Diff line
@@ -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.

 */

include/asm-x86/posix_types.h

+1 −7
Original line number Diff line number Diff line 
#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"

include/asm-x86/processor.h

+1 −2
Original line number Diff line number Diff line
@@ -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 */

include/asm-x86/unistd.h

+1 −7
Original line number Diff line number Diff line 
#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"