diff options
Diffstat (limited to 'arch/x86/mm/fault.c')
-rw-r--r-- | arch/x86/mm/fault.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 800de815519c..25a30b5d6582 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
@@ -330,7 +330,7 @@ static noinline int vmalloc_fault(unsigned long address) | |||
330 | if (!pmd_k) | 330 | if (!pmd_k) |
331 | return -1; | 331 | return -1; |
332 | 332 | ||
333 | if (pmd_huge(*pmd_k)) | 333 | if (pmd_large(*pmd_k)) |
334 | return 0; | 334 | return 0; |
335 | 335 | ||
336 | pte_k = pte_offset_kernel(pmd_k, address); | 336 | pte_k = pte_offset_kernel(pmd_k, address); |
@@ -475,7 +475,7 @@ static noinline int vmalloc_fault(unsigned long address) | |||
475 | if (pud_none(*pud) || pud_pfn(*pud) != pud_pfn(*pud_ref)) | 475 | if (pud_none(*pud) || pud_pfn(*pud) != pud_pfn(*pud_ref)) |
476 | BUG(); | 476 | BUG(); |
477 | 477 | ||
478 | if (pud_huge(*pud)) | 478 | if (pud_large(*pud)) |
479 | return 0; | 479 | return 0; |
480 | 480 | ||
481 | pmd = pmd_offset(pud, address); | 481 | pmd = pmd_offset(pud, address); |
@@ -486,7 +486,7 @@ static noinline int vmalloc_fault(unsigned long address) | |||
486 | if (pmd_none(*pmd) || pmd_pfn(*pmd) != pmd_pfn(*pmd_ref)) | 486 | if (pmd_none(*pmd) || pmd_pfn(*pmd) != pmd_pfn(*pmd_ref)) |
487 | BUG(); | 487 | BUG(); |
488 | 488 | ||
489 | if (pmd_huge(*pmd)) | 489 | if (pmd_large(*pmd)) |
490 | return 0; | 490 | return 0; |
491 | 491 | ||
492 | pte_ref = pte_offset_kernel(pmd_ref, address); | 492 | pte_ref = pte_offset_kernel(pmd_ref, address); |
@@ -1248,10 +1248,6 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code, | |||
1248 | tsk = current; | 1248 | tsk = current; |
1249 | mm = tsk->mm; | 1249 | mm = tsk->mm; |
1250 | 1250 | ||
1251 | /* | ||
1252 | * Detect and handle instructions that would cause a page fault for | ||
1253 | * both a tracked kernel page and a userspace page. | ||
1254 | */ | ||
1255 | prefetchw(&mm->mmap_sem); | 1251 | prefetchw(&mm->mmap_sem); |
1256 | 1252 | ||
1257 | if (unlikely(kmmio_fault(regs, address))) | 1253 | if (unlikely(kmmio_fault(regs, address))) |