summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorgorcunov@gmail.com <gorcunov@gmail.com>2008-03-28 17:56:57 +0300
committerIngo Molnar <mingo@elte.hu>2008-04-17 17:41:33 +0200
commit6b6891f9c545ccd45d6d8ddfd33ce27c22c271a7 (patch)
tree3cfd4cfda9363eac5e9126978e3f2d6dd8b55d32 /include
parent6093015db2bd9e70cf20cdd23be1a50733baafdd (diff)
downloadop-kernel-dev-6b6891f9c545ccd45d6d8ddfd33ce27c22c271a7.zip
op-kernel-dev-6b6891f9c545ccd45d6d8ddfd33ce27c22c271a7.tar.gz
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>
Diffstat (limited to 'include')
-rw-r--r--include/asm-x86/ptrace.h4
-rw-r--r--include/asm-x86/vm86.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-x86/ptrace.h b/include/asm-x86/ptrace.h
index e779f2b..24ec061 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 a2be241..f5f3dc4 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 */
OpenPOWER on IntegriCloud