From 3e73d130359fff5c0712461b1f5ad618e9881bd2 Mon Sep 17 00:00:00 2001
From: Vegard Nossum <vegard.nossum@gmail.com>
Date: Mon, 21 Jul 2008 15:06:35 +0200
Subject: [PATCH] --- yaml --- r: 105625 b: refs/heads/master c:
 04bbe430f73c6c31bbd067349c029e907e153a8d h: refs/heads/master i:   105623:
 8beea4dfb4ef4b81e43f06c166f023a174168ae1 v: v3

---
 [refs]                                  | 2 +-
 trunk/include/asm-x86/processor-flags.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index de2f39a5372c..46e701faace2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9d25d4db81833029d30b7b03cc1000cbbe09e192
+refs/heads/master: 04bbe430f73c6c31bbd067349c029e907e153a8d
diff --git a/trunk/include/asm-x86/processor-flags.h b/trunk/include/asm-x86/processor-flags.h
index 092b39b3a7e6..eff2ecd7fff0 100644
--- a/trunk/include/asm-x86/processor-flags.h
+++ b/trunk/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
 #else
 #define X86_VM_MASK	0 /* No VM86 support */
 #endif
+#endif
 
 #endif	/* __ASM_I386_PROCESSOR_FLAGS_H */