[PATCH] x86: don't leak X86_VM_MASK in processor-flags.h

From: Vegard Nossum
Date: Mon Jul 21 2008 - 08:54:23 EST


commit 6330a30a76c1e62d4b4ec238368957f8febf9113
Author: Vegard Nossum <vegard.nossum@xxxxxxxxx>
Date: Wed May 28 09:46:19 2008 +0200

x86: break mutual header inclusion

introduced some CONFIG names to processor-flags.h, which was exported in

commit 6093015db2bd9e70cf20cdd23be1a50733baafdd
Author: Ingo Molnar <mingo@xxxxxxx>
Date: Sun Mar 30 11:45:23 2008 +0200

x86: cleanup replace most vm86 flags with flags from processor-flags.h, fix

Fix it by wrapping the CONFIG parts in __KERNEL__.

Reported-by: Olaf Hering <olaf@xxxxxxxxx>
Signed-off-by: Vegard Nossum <vegard.nossum@xxxxxxxxx>
include/asm-x86/processor-flags.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/include/asm-x86/processor-flags.h b/include/asm-x86/processor-flags.h
index 092b39b..eff2ecd 100644
--- a/include/asm-x86/processor-flags.h
+++ b/include/asm-x86/processor-flags.h
@@ -88,10 +88,12 @@
#define CX86_ARR_BASE 0xc4
#define CX86_RCR_BASE 0xdc

+#ifdef __KERNEL__
#ifdef CONFIG_VM86
#define X86_VM_MASK X86_EFLAGS_VM
#define X86_VM_MASK 0 /* No VM86 support */

#endif /* __ASM_I386_PROCESSOR_FLAGS_H */

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/