Merge branch 'sh/for-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...

[linux-2.6] / include / asm-x86 / vm86.h

diff --git a/include/asm-x86/vm86.h b/include/asm-x86/vm86.h
index cbf4a0effa75e908450f2eaa69c968bd5b003a80..5ce351325e011c72721d1f58c0b6e2d6f16f77e7 100644 (file)
--- a/include/asm-x86/vm86.h
+++ b/include/asm-x86/vm86.h
@@ -115,7 +115,6 @@ struct vm86plus_info_struct {
        unsigned long is_vm86pus:1;           /* for vm86 internal use */
        unsigned char vm86dbg_intxxtab[32];   /* for debugger */
 };
-
 struct vm86plus_struct {
        struct vm86_regs regs;
        unsigned long flags;
@@ -128,11 +127,7 @@ 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
+#include <asm/ptrace.h>
 
 /*
  * This is the (kernel) stack-layout when we have done a "SAVE_ALL" from vm86
@@ -142,7 +137,6 @@ struct vm86plus_struct {
  * at the end of the structure. Look at ptrace.h to see the "normal"
  * setup. For user space layout see 'struct vm86_regs' above.
  */
-#include <asm/ptrace.h>
 
 struct kernel_vm86_regs {
 /*