| commit | 985990137e81ca9fd6561cd0f7d1a9695ec57d5a | [log] [tgz] |
|---|---|---|
| author | Paul Mackerras <paulus@samba.org> | Sat Oct 22 16:51:34 2005 +1000 |
| committer | Paul Mackerras <paulus@samba.org> | Sat Oct 22 16:51:34 2005 +1000 |
| tree | 7a67493285623a7356ba7065cada6728993d1a3b | |
| parent | 834289447542b7ec55c0847486616d4d53ddf891 [diff] [blame] | |
| parent | 63172cb3d5ef762dcb60a292bc7f016b85cf6e1f [diff] [blame] |
Merge changes from linux-2.6 by hand
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 55b5860..5e92067 100644 --- a/arch/powerpc/mm/mem.c +++ b/arch/powerpc/mm/mem.c
@@ -477,8 +477,7 @@ 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