From 1a16de3a46376f4a74049c737870362a84d7df15 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Mon, 12 May 2008 15:43:38 +0200
Subject: [PATCH] --- yaml --- r: 99372 b: refs/heads/master c:
 9831bfb201a8e00415d0f9e5b5a50d902a90b2db h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/include/asm-x86/vm86.h | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 0d1d1f269cb0..579bf7281b8b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ebdd561a19d7917ac49fff9c355aa4833c504bf1
+refs/heads/master: 9831bfb201a8e00415d0f9e5b5a50d902a90b2db
diff --git a/trunk/include/asm-x86/vm86.h b/trunk/include/asm-x86/vm86.h
index 074b357146df..cbf4a0effa75 100644
--- a/trunk/include/asm-x86/vm86.h
+++ b/trunk/include/asm-x86/vm86.h
@@ -14,12 +14,6 @@
 
 #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
-
 #define BIOSSEG		0x0f000
 
 #define CPU_086		0
@@ -133,6 +127,13 @@ struct vm86plus_struct {
 };
 
 #ifdef __KERNEL__
+
+#ifdef CONFIG_VM86
+#define X86_VM_MASK	X86_EFLAGS_VM
+#else
+#define X86_VM_MASK	0 /* No VM86 support */
+#endif
+
 /*
  * This is the (kernel) stack-layout when we have done a "SAVE_ALL" from vm86
  * mode - the main change is that the old segment descriptors aren't