diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-10-27 12:53:03 -0700 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-10-27 12:53:03 -0700 |
| commit | 04290949b3daef35d6279dcc05f01b549ac1772b (patch) | |
| tree | d34203b71660b9b4f7676f5bae7e0b9838ff161f /arch/ppc64/mm | |
| parent | d6d3f5bc68be3c4ab84e6f1f9db92291da671504 (diff) | |
| parent | 72ab373a5688a78cbdaf3bf96012e597d5399bb7 (diff) | |
| download | op-kernel-dev-04290949b3daef35d6279dcc05f01b549ac1772b.zip op-kernel-dev-04290949b3daef35d6279dcc05f01b549ac1772b.tar.gz | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ppc64/mm')
| -rw-r--r-- | arch/ppc64/mm/init.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ppc64/mm/init.c b/arch/ppc64/mm/init.c index c2157c9..be64b15 100644 --- a/arch/ppc64/mm/init.c +++ b/arch/ppc64/mm/init.c @@ -799,8 +799,7 @@ void update_mmu_cache(struct vm_area_struct *vma, unsigned long ea, if (cpus_equal(vma->vm_mm->cpu_vm_mask, tmp)) local = 1; - __hash_page(ea, pte_val(pte) & (_PAGE_USER|_PAGE_RW), vsid, ptep, - 0x300, local); + __hash_page(ea, 0, vsid, ptep, 0x300, local); local_irq_restore(flags); } |
