Commit 6330a30a authored by Vegard Nossum's avatar Vegard Nossum Committed by Ingo Molnar
Browse files

x86: break mutual header inclusion 



This breaks up the mutual inclusion between headers ptrace.h and vm86.h
by moving some small part of vm86.h which is needed by ptrace.h into
processor-flags.h.

We also try to move #include lines to the top.

This has been compile tested on x86_32 and x86_64 defconfig, and run
through 'make headers_check'.

Cc: Adrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarVegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 83bea8e1

include/asm-x86/processor-flags.h

+6 −0
Original line number Diff line number Diff line
@@ -88,4 +88,10 @@ 
#define CX86_ARR_BASE	0xc4

#define CX86_RCR_BASE	0xdc



#ifdef CONFIG_VM86

#define X86_VM_MASK	X86_EFLAGS_VM

#else

#define X86_VM_MASK	0 /* No VM86 support */

#endif



#endif	/* __ASM_I386_PROCESSOR_FLAGS_H */

include/asm-x86/ptrace.h

+5 −3
Original line number Diff line number Diff line
@@ -3,7 +3,12 @@ 


#include <linux/compiler.h>	/* For __user */

#include <asm/ptrace-abi.h>

#include <asm/processor-flags.h>



#ifdef __KERNEL__

#include <asm/ds.h>		/* the DS BTS struct is used for ptrace too */

#include <asm/segment.h>

#endif



#ifndef __ASSEMBLY__
@@ -55,9 +60,6 @@ struct pt_regs { 
	unsigned long ss;

};



#include <asm/vm86.h>

#include <asm/segment.h>



#endif /* __KERNEL__ */



#else /* __i386__ */

include/asm-x86/vm86.h

+1 −7
Original line number Diff line number Diff line
@@ -115,7 +115,6 @@ struct vm86plus_info_struct { 
	unsigned long is_vm86pus:1;	      /* for vm86 internal use */

	unsigned char vm86dbg_intxxtab[32];   /* for debugger */

};



struct vm86plus_struct {

	struct vm86_regs regs;

	unsigned long flags;
@@ -128,11 +127,7 @@ struct vm86plus_struct { 


#ifdef __KERNEL__



#ifdef CONFIG_VM86

#define X86_VM_MASK	X86_EFLAGS_VM

#else

#define X86_VM_MASK	0 /* No VM86 support */

#endif

#include <asm/ptrace.h>



/*

 * This is the (kernel) stack-layout when we have done a "SAVE_ALL" from vm86
@@ -142,7 +137,6 @@ struct vm86plus_struct { 
 * at the end of the structure. Look at ptrace.h to see the "normal"

 * setup. For user space layout see 'struct vm86_regs' above.

 */

#include <asm/ptrace.h>



struct kernel_vm86_regs {

/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE