diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ppc64/kernel/time.c | 2 | ||||
-rw-r--r-- | arch/ppc64/mm/init.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c index 9939c206afa4..b56c6a324e17 100644 --- a/arch/ppc64/kernel/time.c +++ b/arch/ppc64/kernel/time.c | |||
@@ -870,7 +870,7 @@ void div128_by_32( unsigned long dividend_high, unsigned long dividend_low, | |||
870 | rb = ((ra + b) - (x * divisor)) << 32; | 870 | rb = ((ra + b) - (x * divisor)) << 32; |
871 | 871 | ||
872 | y = (rb + c)/divisor; | 872 | y = (rb + c)/divisor; |
873 | rc = ((rb + b) - (y * divisor)) << 32; | 873 | rc = ((rb + c) - (y * divisor)) << 32; |
874 | 874 | ||
875 | z = (rc + d)/divisor; | 875 | z = (rc + d)/divisor; |
876 | 876 | ||
diff --git a/arch/ppc64/mm/init.c b/arch/ppc64/mm/init.c index c2157c9c3acb..be64b157afce 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, | |||
799 | if (cpus_equal(vma->vm_mm->cpu_vm_mask, tmp)) | 799 | if (cpus_equal(vma->vm_mm->cpu_vm_mask, tmp)) |
800 | local = 1; | 800 | local = 1; |
801 | 801 | ||
802 | __hash_page(ea, pte_val(pte) & (_PAGE_USER|_PAGE_RW), vsid, ptep, | 802 | __hash_page(ea, 0, vsid, ptep, 0x300, local); |
803 | 0x300, local); | ||
804 | local_irq_restore(flags); | 803 | local_irq_restore(flags); |
805 | } | 804 | } |
806 | 805 | ||