aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/vm86_32.c
diff options
context:
space:
mode:
authorgorcunov@gmail.com <gorcunov@gmail.com>2008-03-28 10:56:57 -0400
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:41:33 -0400
commit6b6891f9c545ccd45d6d8ddfd33ce27c22c271a7 (patch)
tree3cfd4cfda9363eac5e9126978e3f2d6dd8b55d32 /arch/x86/kernel/vm86_32.c
parent6093015db2bd9e70cf20cdd23be1a50733baafdd (diff)
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 'arch/x86/kernel/vm86_32.c')
-rw-r--r--arch/x86/kernel/vm86_32.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c
index 51040698c222..c866c00f4a85 100644
--- a/arch/x86/kernel/vm86_32.c
+++ b/arch/x86/kernel/vm86_32.c
@@ -299,7 +299,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
299 VEFLAGS = info->regs.pt.flags; 299 VEFLAGS = info->regs.pt.flags;
300 info->regs.pt.flags &= SAFE_MASK; 300 info->regs.pt.flags &= SAFE_MASK;
301 info->regs.pt.flags |= info->regs32->flags & ~SAFE_MASK; 301 info->regs.pt.flags |= info->regs32->flags & ~SAFE_MASK;
302 info->regs.pt.flags |= VM_MASK; 302 info->regs.pt.flags |= X86_VM_MASK;
303 303
304 switch (info->cpu_type) { 304 switch (info->cpu_type) {
305 case CPU_286: 305 case CPU_286: