From d073f750d8216699aec7c837d8b5512b4c99e662 Mon Sep 17 00:00:00 2001 From: Li Zhong Date: Mon, 15 Apr 2013 16:53:20 +0000 Subject: [PATCH] --- yaml --- r: 370780 b: refs/heads/master c: 016af59f0f8cd10f27773df8f0034b5f3b46a138 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/hash_utils_64.c | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index ba3eef68e1e8..5eb339770e9a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b170bd3de6a7f6fbfba331e300751450f55d8822 +refs/heads/master: 016af59f0f8cd10f27773df8f0034b5f3b46a138 diff --git a/trunk/arch/powerpc/mm/hash_utils_64.c b/trunk/arch/powerpc/mm/hash_utils_64.c index ead9fa84ffd9..1ed4419c533b 100644 --- a/trunk/arch/powerpc/mm/hash_utils_64.c +++ b/trunk/arch/powerpc/mm/hash_utils_64.c @@ -1268,21 +1268,22 @@ long hpte_insert_repeating(unsigned long hash, unsigned long vpn, #ifdef CONFIG_DEBUG_PAGEALLOC static void kernel_map_linear_page(unsigned long vaddr, unsigned long lmi) { - unsigned long hash, hpteg; + unsigned long hash; unsigned long vsid = get_kernel_vsid(vaddr, mmu_kernel_ssize); unsigned long vpn = hpt_vpn(vaddr, vsid, mmu_kernel_ssize); unsigned long mode = htab_convert_pte_flags(PAGE_KERNEL); - int ret; + long ret; hash = hpt_hash(vpn, PAGE_SHIFT, mmu_kernel_ssize); - hpteg = ((hash & htab_hash_mask) * HPTES_PER_GROUP); /* Don't create HPTE entries for bad address */ if (!vsid) return; - ret = ppc_md.hpte_insert(hpteg, vpn, __pa(vaddr), - mode, HPTE_V_BOLTED, - mmu_linear_psize, mmu_kernel_ssize); + + ret = hpte_insert_repeating(hash, vpn, __pa(vaddr), mode, + HPTE_V_BOLTED, + mmu_linear_psize, mmu_kernel_ssize); + BUG_ON (ret < 0); spin_lock(&linear_map_hash_lock); BUG_ON(linear_map_hash_slots[lmi] & 0x80);