[#2][PATCH] x86: break mutual header inclusion
From: Vegard Nossum <[email protected]>
Date: Tue, 27 May 2008 21:38:35 +0200
Subject: [PATCH] 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'.
--- include/asm-x86/processor-flags.h | 6 ++++++ include/asm-x86/ptrace.h | 11 +++++------ include/asm-x86/vm86.h | 8 +------- 3 files changed, 12 insertions(+), 13 deletions(-)
include/asm-x86/processor-flags.h +6 -0
@@ -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 -6
@@ -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__ */
@@ -127,9 +129,6 @@ struct pt_regs {#ifdef __KERNEL__ -/* the DS BTS struct is used for ptrace as well */ -#include <asm/ds.h> -struct task_struct ;extern void ptrace_bts_take_timestamp (struct task_struct *,enum bts_qualifier );
include/asm-x86/vm86.h +1 -7
@@ -13,12 +13,7 @@*/ #include <asm/processor-flags.h> - -#ifdef CONFIG_VM86 -#define X86_VM_MASK X86_EFLAGS_VM -#else -#define X86_VM_MASK 0/* No VM86 support */ -#endif +#include <asm/ptrace.h> #define BIOSSEG 0x0f000
@@ -141,7 +136,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 {/*
Signature · 1 line
1.5.4.1
Ingo Molnar
AppliedQuoted 4 lines · Vegard Nossum
From: Vegard Nossum <[email protected]>
Date: Tue, 27 May 2008 21:38:35 +0200
Subject: [PATCH] x86: break mutual header inclusion
Quoted 8 lines
This breaks up the mutual inclusion between headers
ptrace.handvm86.hby moving some small part ofvm86.hwhich is needed byptrace.hintoprocessor-flags.h.We also try to move #include lines to the top.
This has been compile tested on
x86_32andx86_64defconfig, and run through 'makeheaders_check'.
applied to tip/x86/cleanups. Thanks,
Ingo