leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: break mutual header inclusion

Browse Source 
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: Vegard Nossum <vegard.nossum@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Vegard Nossum 2008-05-28 09:46:19 +02:00 committed by Ingo Molnar
parent 83bea8e1fa
commit 6330a30a76
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/asm-x86/processor-flags.h
View File

@ -88,4 +88,10 @@
#define CX86_ARR_BASE 0xc4 #define CX86_ARR_BASE 0xc4
#define CX86_RCR_BASE 0xdc #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 */ #endif /* __ASM_I386_PROCESSOR_FLAGS_H */

8
include/asm-x86/ptrace.h
View File

@ -3,7 +3,12 @@
#include <linux/compiler.h> /* For __user */ #include <linux/compiler.h> /* For __user */
#include <asm/ptrace-abi.h> #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__ #ifndef __ASSEMBLY__
@ -55,9 +60,6 @@ struct pt_regs {
unsigned long ss; unsigned long ss;
}; };
#include <asm/vm86.h>
#include <asm/segment.h>
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#else /* __i386__ */ #else /* __i386__ */

8
include/asm-x86/vm86.h
View File

@ -115,7 +115,6 @@ struct vm86plus_info_struct {
unsigned long is_vm86pus:1; /* for vm86 internal use */ unsigned long is_vm86pus:1; /* for vm86 internal use */
unsigned char vm86dbg_intxxtab[32]; /* for debugger */ unsigned char vm86dbg_intxxtab[32]; /* for debugger */
}; };
struct vm86plus_struct { struct vm86plus_struct {
struct vm86_regs regs; struct vm86_regs regs;
unsigned long flags; unsigned long flags;
@ -128,11 +127,7 @@ struct vm86plus_struct {
#ifdef __KERNEL__ #ifdef __KERNEL__
#ifdef CONFIG_VM86 #include <asm/ptrace.h>
#define X86_VM_MASK X86_EFLAGS_VM
#else
#define X86_VM_MASK 0 /* No VM86 support */
#endif
/* /*
* This is the (kernel) stack-layout when we have done a "SAVE_ALL" from vm86 * 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" * at the end of the structure. Look at ptrace.h to see the "normal"
* setup. For user space layout see 'struct vm86_regs' above. * setup. For user space layout see 'struct vm86_regs' above.
*/ */
#include <asm/ptrace.h>
struct kernel_vm86_regs { struct kernel_vm86_regs {
/* /*