[PATCH 05/16] powerpc/mm: use hash_invalidate for __kernel_map_pages()

[Aneesh Kumar K.V]

Signed-off-by: Aneesh Kumar K.V <aneesh.ku...@linux.vnet.ibm.com>
---
 arch/powerpc/mm/hash_utils_64.c | 32 +++++---------------------------
 1 file changed, 5 insertions(+), 27 deletions(-)

diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index b197fe57547e..8635b241e2d5 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -119,11 +119,6 @@ EXPORT_SYMBOL_GPL(mmu_slb_size);
 #ifdef CONFIG_PPC_64K_PAGES
 int mmu_ci_restrictions;
 #endif
-#ifdef CONFIG_DEBUG_PAGEALLOC
-static u8 *linear_map_hash_slots;
-static unsigned long linear_map_hash_count;
-static DEFINE_SPINLOCK(linear_map_hash_lock);
-#endif /* CONFIG_DEBUG_PAGEALLOC */
 struct mmu_hash_ops mmu_hash_ops;
 EXPORT_SYMBOL(mmu_hash_ops);
 
@@ -1744,7 +1739,7 @@ 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)
+static void kernel_map_linear_page(unsigned long vaddr)
 {
        unsigned long hash;
        unsigned long vsid = get_kernel_vsid(vaddr, mmu_kernel_ssize);
@@ -1761,12 +1756,7 @@ static void kernel_map_linear_page(unsigned long vaddr, 
unsigned long lmi)
        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);
-       linear_map_hash_slots[lmi] = ret | 0x80;
-       spin_unlock(&linear_map_hash_lock);
 }
 
 static void kernel_unmap_linear_page(unsigned long vaddr, unsigned long lmi)
@@ -1776,35 +1766,23 @@ static void kernel_unmap_linear_page(unsigned long 
vaddr, unsigned long lmi)
        unsigned long vpn = hpt_vpn(vaddr, vsid, mmu_kernel_ssize);
 
        hash = hpt_hash(vpn, PAGE_SHIFT, mmu_kernel_ssize);
-       spin_lock(&linear_map_hash_lock);
-       BUG_ON(!(linear_map_hash_slots[lmi] & 0x80));
-       hidx = linear_map_hash_slots[lmi] & 0x7f;
-       linear_map_hash_slots[lmi] = 0;
-       spin_unlock(&linear_map_hash_lock);
-       if (hidx & _PTEIDX_SECONDARY)
-               hash = ~hash;
-       slot = (hash & htab_hash_mask) * HPTES_PER_GROUP;
-       slot += hidx & _PTEIDX_GROUP_IX;
-       mmu_hash_ops.hpte_invalidate(slot, vpn, mmu_linear_psize,
+       mmu_hash_ops.hash_invalidate(hash, vpn, mmu_linear_psize,
                                     mmu_linear_psize,
                                     mmu_kernel_ssize, 0);
 }
 
 void __kernel_map_pages(struct page *page, int numpages, int enable)
 {
-       unsigned long flags, vaddr, lmi;
+       unsigned long flags, vaddr;
        int i;
 
        local_irq_save(flags);
        for (i = 0; i < numpages; i++, page++) {
                vaddr = (unsigned long)page_address(page);
-               lmi = __pa(vaddr) >> PAGE_SHIFT;
-               if (lmi >= linear_map_hash_count)
-                       continue;
                if (enable)
-                       kernel_map_linear_page(vaddr, lmi);
+                       kernel_map_linear_page(vaddr);
                else
-                       kernel_unmap_linear_page(vaddr, lmi);
+                       kernel_unmap_linear_page(vaddr);
        }
        local_irq_restore(flags);
 }
-- 
2.13.6