x86: cleanup - rename VM_MASK to X86_VM_MASK

This patch renames VM_MASK to X86_VM_MASK (which
in turn defined as alias to X86_EFLAGS_VM) to better
distinguish from virtual memory flags. We can't just
use X86_EFLAGS_VM instead because it is also used
for conditional compilation

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

2 files changed, 4 insertions, 4 deletions

diff --git a/include/asm-x86/ptrace.h b/include/asm-x86/ptrace.h
index e779f2b26b32..24ec061566c5 100644
--- a/include/asm-x86/ptrace.h
+++ b/include/asm-x86/ptrace.h
@@ -170,7 +170,7 @@ static inline int user_mode(struct pt_regs *regs)
 static inline int user_mode_vm(struct pt_regs *regs)
 {
 #ifdef CONFIG_X86_32
-        return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & VM_MASK)) >=
+        return ((regs->cs & SEGMENT_RPL_MASK) | (regs->flags & X86_VM_MASK)) >=
                 USER_RPL;
 #else
         return user_mode(regs);
@@ -180,7 +180,7 @@ static inline int user_mode_vm(struct pt_regs *regs)
 static inline int v8086_mode(struct pt_regs *regs)
 {
 #ifdef CONFIG_X86_32
-        return (regs->flags & VM_MASK);
+        return (regs->flags & X86_VM_MASK);
 #else
         return 0;       /* No V86 mode support in long mode */
 #endif
diff --git a/include/asm-x86/vm86.h b/include/asm-x86/vm86.h
index a2be241ed036..f5f3dc479c34 100644
--- a/include/asm-x86/vm86.h
+++ b/include/asm-x86/vm86.h
@@ -17,9 +17,9 @@
 #define IOPL_MASK       0x00003000
 #define NT_MASK         0x00004000
 #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 */