Merge changes from linux-2.6 by hand

[linux-2.6-omap-h63xx.git] / arch / powerpc / mm / mem.c

diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 55b5860ed3c98c21c1633f915bdb0b0be94de1c7..5e9206715f09f5963f8bf6f6ba095dc07a22e65b 100644 (file)
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -477,8 +477,7 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long address,
        if (cpus_equal(vma->vm_mm->cpu_vm_mask, tmp))
                local = 1;
 
-       __hash_page(address, pte_val(pte) & (_PAGE_USER|_PAGE_RW), vsid, ptep,
-                   0x300, local);
+       __hash_page(address, 0, vsid, ptep, 0x300, local);
        local_irq_restore(flags);
 #endif
 #endif