aboutsummaryrefslogtreecommitdiff
path: root/include/asm-x86/processor-flags.h
diff options
context:
space:
mode:
authorVegard Nossum <vegard.nossum@gmail.com>2008-05-28 09:46:19 +0200
committerIngo Molnar <mingo@elte.hu>2008-06-02 12:48:23 +0200
commit6330a30a76c1e62d4b4ec238368957f8febf9113 (patch)
tree4d7d5ec2cee6ad27c914ced59a624a1bc2f5601d /include/asm-x86/processor-flags.h
parent83bea8e1fa0c47b30664b6f92397c016c22f77fb (diff)
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: Vegard Nossum <vegard.nossum@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/processor-flags.h')
-rw-r--r--include/asm-x86/processor-flags.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-x86/processor-flags.h b/include/asm-x86/processor-flags.h
index 199cab107d8..092b39b3a7e 100644
--- a/include/asm-x86/processor-flags.h
+++ b/include/asm-x86/processor-flags.h
@@ -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 */