diff options
| author | gorcunov@gmail.com <gorcunov@gmail.com> | 2008-03-28 14:56:57 (GMT) |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 15:41:33 (GMT) |
| commit | 6b6891f9c545ccd45d6d8ddfd33ce27c22c271a7 (patch) | |
| tree | 3cfd4cfda9363eac5e9126978e3f2d6dd8b55d32 /arch/x86/mm/fault.c | |
| parent | 6093015db2bd9e70cf20cdd23be1a50733baafdd (diff) | |
| download | linux-6b6891f9c545ccd45d6d8ddfd33ce27c22c271a7.tar.xz | |
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/mm/fault.c')
| -rw-r--r-- | arch/x86/mm/fault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 81fcbee..fd7e179 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -639,7 +639,7 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code) #ifdef CONFIG_X86_32 /* It's safe to allow irq's after cr2 has been saved and the vmalloc fault has been handled. */ - if (regs->flags & (X86_EFLAGS_IF|VM_MASK)) + if (regs->flags & (X86_EFLAGS_IF | X86_VM_MASK)) local_irq_enable(); /* |