diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-22 02:51:34 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-22 02:51:34 -0400 |
| commit | 985990137e81ca9fd6561cd0f7d1a9695ec57d5a (patch) | |
| tree | 7a67493285623a7356ba7065cada6728993d1a3b /arch/powerpc/mm/mem.c | |
| parent | 834289447542b7ec55c0847486616d4d53ddf891 (diff) | |
| parent | 63172cb3d5ef762dcb60a292bc7f016b85cf6e1f (diff) | |
Merge changes from linux-2.6 by hand
Diffstat (limited to 'arch/powerpc/mm/mem.c')
| -rw-r--r-- | arch/powerpc/mm/mem.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c index 55b5860ed3c9..5e9206715f09 100644 --- 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, | |||
| 477 | if (cpus_equal(vma->vm_mm->cpu_vm_mask, tmp)) | 477 | if (cpus_equal(vma->vm_mm->cpu_vm_mask, tmp)) |
| 478 | local = 1; | 478 | local = 1; |
| 479 | 479 | ||
| 480 | __hash_page(address, pte_val(pte) & (_PAGE_USER|_PAGE_RW), vsid, ptep, | 480 | __hash_page(address, 0, vsid, ptep, 0x300, local); |
| 481 | 0x300, local); | ||
| 482 | local_irq_restore(flags); | 481 | local_irq_restore(flags); |
| 483 | #endif | 482 | #endif |
| 484 | #endif | 483 | #endif |