diff options
Diffstat (limited to 'arch/x86/mm/fault.c')
| -rw-r--r-- | arch/x86/mm/fault.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index ec08d8389850..fd7e1798c75a 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) | |||
| 639 | #ifdef CONFIG_X86_32 | 639 | #ifdef CONFIG_X86_32 |
| 640 | /* It's safe to allow irq's after cr2 has been saved and the vmalloc | 640 | /* It's safe to allow irq's after cr2 has been saved and the vmalloc |
| 641 | fault has been handled. */ | 641 | fault has been handled. */ |
| 642 | if (regs->flags & (X86_EFLAGS_IF|VM_MASK)) | 642 | if (regs->flags & (X86_EFLAGS_IF | X86_VM_MASK)) |
| 643 | local_irq_enable(); | 643 | local_irq_enable(); |
| 644 | 644 | ||
| 645 | /* | 645 | /* |
| @@ -976,9 +976,5 @@ void vmalloc_sync_all(void) | |||
| 976 | if (address == start) | 976 | if (address == start) |
| 977 | start = address + PGDIR_SIZE; | 977 | start = address + PGDIR_SIZE; |
| 978 | } | 978 | } |
| 979 | /* Check that there is no need to do the same for the modules area. */ | ||
| 980 | BUILD_BUG_ON(!(MODULES_VADDR > __START_KERNEL)); | ||
| 981 | BUILD_BUG_ON(!(((MODULES_END - 1) & PGDIR_MASK) == | ||
| 982 | (__START_KERNEL & PGDIR_MASK))); | ||
| 983 | #endif | 979 | #endif |
| 984 | } | 980 | } |
