diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 22:15:37 +0400 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2014-03-05 22:15:37 +0400 |
| commit | 994448f1afa6689bafbebaf7412b23b541b41ef5 (patch) | |
| tree | b7460c6a9bdadc6554ad7f0da52b5c60403164c1 /arch/x86/mm/fault.c | |
| parent | 4fd69331ad227a4d8de26592d017b73e00caca9f (diff) | |
| parent | 18c46461d9e42d398536055f31f58cdcd2c6347e (diff) | |
| download | linux-994448f1afa6689bafbebaf7412b23b541b41ef5.tar.xz | |
Merge remote-tracking branch 'tip/x86/efi-mixed' into efi-for-mingo
Conflicts:
arch/x86/kernel/setup.c
arch/x86/platform/efi/efi.c
arch/x86/platform/efi/efi_64.c
Diffstat (limited to 'arch/x86/mm/fault.c')
| -rw-r--r-- | arch/x86/mm/fault.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index e7fa28bf3262..a92c4c999787 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c @@ -584,8 +584,13 @@ show_fault_oops(struct pt_regs *regs, unsigned long error_code, if (error_code & PF_INSTR) { unsigned int level; + pgd_t *pgd; + pte_t *pte; - pte_t *pte = lookup_address(address, &level); + pgd = __va(read_cr3() & PHYSICAL_PAGE_MASK); + pgd += pgd_index(address); + + pte = lookup_address_in_pgd(pgd, address, &level); if (pte && pte_present(*pte) && !pte_exec(*pte)) printk(nx_warning, from_kuid(&init_user_ns, current_uid())); |