asm-*/futex.h should include linux/uaccess.h

[sfrench/cifs-2.6.git] / include / asm-x86 / vm86.h

diff --git a/include/asm-x86/vm86.h b/include/asm-x86/vm86.h
index c92fe4af52e891a42b6c7907d78e0338eafa5918..074b357146dfec048d79518ca8bb1107439127bb 100644 (file)
--- a/include/asm-x86/vm86.h
+++ b/include/asm-x86/vm86.h
@@ -12,19 +12,13 @@
  * Linus
  */
 
-#define TF_MASK                0x00000100
-#define IF_MASK                0x00000200
-#define IOPL_MASK      0x00003000
-#define NT_MASK                0x00004000
+#include <asm/processor-flags.h>
+
 #ifdef CONFIG_VM86
-#define VM_MASK                0x00020000
+#define X86_VM_MASK    X86_EFLAGS_VM
 #else
-#define VM_MASK                0 /* ignored */
+#define X86_VM_MASK    0 /* No VM86 support */
 #endif
-#define AC_MASK                0x00040000
-#define VIF_MASK       0x00080000      /* virtual interrupt flag */
-#define VIP_MASK       0x00100000      /* virtual interrupt pending */
-#define ID_MASK                0x00200000
 
 #define BIOSSEG                0x0f000
 
@@ -42,9 +36,11 @@
 #define VM86_ARG(retval)       ((retval) >> 8)
 
 #define VM86_SIGNAL    0       /* return due to signal */
-#define VM86_UNKNOWN   1       /* unhandled GP fault - IO-instruction or similar */
+#define VM86_UNKNOWN   1       /* unhandled GP fault
+                                  - IO-instruction or similar */
 #define VM86_INTx      2       /* int3/int x instruction (ARG = x) */
-#define VM86_STI       3       /* sti/popf/iret instruction enabled virtual interrupts */
+#define VM86_STI       3       /* sti/popf/iret instruction enabled
+                                  virtual interrupts */
 
 /*
  * Additional return values when invoking new vm86()
@@ -205,7 +201,8 @@ void release_vm86_irqs(struct task_struct *);
 #define handle_vm86_fault(a, b)
 #define release_vm86_irqs(a)
 
-static inline int handle_vm86_trap(struct kernel_vm86_regs *a, long b, int c) {
+static inline int handle_vm86_trap(struct kernel_vm86_regs *a, long b, int c)
+{
        return 0;
 }