Merge ../linux-2.6

[mv-sheeva.git] / include / asm-x86 / processor-flags.h

diff --git a/include/asm-x86/processor-flags.h b/include/asm-x86/processor-flags.h
index 199cab107d85d134d697dcc3b6ab4227513a2bb9..eff2ecd7fff067caf89bc48cd81bebe111a43363 100644 (file)
--- a/include/asm-x86/processor-flags.h
+++ b/include/asm-x86/processor-flags.h
@@ -88,4 +88,12 @@
 #define CX86_ARR_BASE  0xc4
 #define CX86_RCR_BASE  0xdc
 
+#ifdef __KERNEL__
+#ifdef CONFIG_VM86
+#define X86_VM_MASK    X86_EFLAGS_VM
+#else
+#define X86_VM_MASK    0 /* No VM86 support */
+#endif
+#endif
+
 #endif /* __ASM_I386_PROCESSOR_FLAGS_H */