diff options
Diffstat (limited to 'include/asm-x86/vm86.h')
-rw-r--r-- | include/asm-x86/vm86.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/asm-x86/vm86.h b/include/asm-x86/vm86.h index 074b357146df..cbf4a0effa75 100644 --- a/include/asm-x86/vm86.h +++ b/include/asm-x86/vm86.h | |||
@@ -14,12 +14,6 @@ | |||
14 | 14 | ||
15 | #include <asm/processor-flags.h> | 15 | #include <asm/processor-flags.h> |
16 | 16 | ||
17 | #ifdef CONFIG_VM86 | ||
18 | #define X86_VM_MASK X86_EFLAGS_VM | ||
19 | #else | ||
20 | #define X86_VM_MASK 0 /* No VM86 support */ | ||
21 | #endif | ||
22 | |||
23 | #define BIOSSEG 0x0f000 | 17 | #define BIOSSEG 0x0f000 |
24 | 18 | ||
25 | #define CPU_086 0 | 19 | #define CPU_086 0 |
@@ -133,6 +127,13 @@ struct vm86plus_struct { | |||
133 | }; | 127 | }; |
134 | 128 | ||
135 | #ifdef __KERNEL__ | 129 | #ifdef __KERNEL__ |
130 | |||
131 | #ifdef CONFIG_VM86 | ||
132 | #define X86_VM_MASK X86_EFLAGS_VM | ||
133 | #else | ||
134 | #define X86_VM_MASK 0 /* No VM86 support */ | ||
135 | #endif | ||
136 | |||
136 | /* | 137 | /* |
137 | * This is the (kernel) stack-layout when we have done a "SAVE_ALL" from vm86 | 138 | * This is the (kernel) stack-layout when we have done a "SAVE_ALL" from vm86 |
138 | * mode - the main change is that the old segment descriptors aren't | 139 | * mode - the main change is that the old segment descriptors aren't |