diff options
Diffstat (limited to 'arch/powerpc/mm/mem.c')
-rw-r--r-- | arch/powerpc/mm/mem.c | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index f00f09a77f12..f668fa9ba804 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c | |||
@@ -472,40 +472,7 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address, | |||
472 | { | 472 | { |
473 | #ifdef CONFIG_PPC_STD_MMU | 473 | #ifdef CONFIG_PPC_STD_MMU |
474 | unsigned long access = 0, trap; | 474 | unsigned long access = 0, trap; |
475 | #endif | ||
476 | unsigned long pfn = pte_pfn(pte); | ||
477 | |||
478 | /* handle i-cache coherency */ | ||
479 | if (!cpu_has_feature(CPU_FTR_COHERENT_ICACHE) && | ||
480 | !cpu_has_feature(CPU_FTR_NOEXECUTE) && | ||
481 | pfn_valid(pfn)) { | ||
482 | struct page *page = pfn_to_page(pfn); | ||
483 | #ifdef CONFIG_8xx | ||
484 | /* On 8xx, cache control instructions (particularly | ||
485 | * "dcbst" from flush_dcache_icache) fault as write | ||
486 | * operation if there is an unpopulated TLB entry | ||
487 | * for the address in question. To workaround that, | ||
488 | * we invalidate the TLB here, thus avoiding dcbst | ||
489 | * misbehaviour. | ||
490 | */ | ||
491 | _tlbil_va(address, 0 /* 8xx doesn't care about PID */); | ||
492 | #endif | ||
493 | /* The _PAGE_USER test should really be _PAGE_EXEC, but | ||
494 | * older glibc versions execute some code from no-exec | ||
495 | * pages, which for now we are supporting. If exec-only | ||
496 | * pages are ever implemented, this will have to change. | ||
497 | */ | ||
498 | if (!PageReserved(page) && (pte_val(pte) & _PAGE_USER) | ||
499 | && !test_bit(PG_arch_1, &page->flags)) { | ||
500 | if (vma->vm_mm == current->active_mm) { | ||
501 | __flush_dcache_icache((void *) address); | ||
502 | } else | ||
503 | flush_dcache_icache_page(page); | ||
504 | set_bit(PG_arch_1, &page->flags); | ||
505 | } | ||
506 | } | ||
507 | 475 | ||
508 | #ifdef CONFIG_PPC_STD_MMU | ||
509 | /* We only want HPTEs for linux PTEs that have _PAGE_ACCESSED set */ | 476 | /* We only want HPTEs for linux PTEs that have _PAGE_ACCESSED set */ |
510 | if (!pte_young(pte) || address >= TASK_SIZE) | 477 | if (!pte_young(pte) || address >= TASK_SIZE) |
511 | return; | 478 | return; |