s390/mm: add missing conversion to use ptdescs

Commit 6326c26c1514 ("s390: convert various pgalloc functions
to use ptdescs") missed to convert tlb_remove_table() into
tlb_remove_ptdesc() in few locations.

Reviewed-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Alexander Gordeev <agordeev@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>

diff --git a/arch/s390/include/asm/tlb.h b/arch/s390/include/asm/tlb.h
index 383b1f91442c997b21af066a287318020a88dea2..a0089b2e5e6740aad636a9b26f9697ae41510193 100644 (file)
--- a/arch/s390/include/asm/tlb.h
+++ b/arch/s390/include/asm/tlb.h
@@ -112,7 +112,7 @@ static inline void p4d_free_tlb(struct mmu_gather *tlb, p4d_t *p4d,
        __tlb_adjust_range(tlb, address, PAGE_SIZE);
        tlb->mm->context.flush_mm = 1;
        tlb->freed_tables = 1;
-       tlb_remove_table(tlb, p4d);
+       tlb_remove_ptdesc(tlb, p4d);
 }
 
 /*
@@ -130,7 +130,7 @@ static inline void pud_free_tlb(struct mmu_gather *tlb, pud_t *pud,
        tlb->mm->context.flush_mm = 1;
        tlb->freed_tables = 1;
        tlb->cleared_p4ds = 1;
-       tlb_remove_table(tlb, pud);
+       tlb_remove_ptdesc(tlb, pud);
 }
 
 

diff --git a/arch/s390/mm/pgalloc.c b/arch/s390/mm/pgalloc.c
index 5488ae17318ee314698ab16b7ce3a368fd8e8f0d..15f6a3ef40e8d85956671864afdc335bf48b186d 100644 (file)
--- a/arch/s390/mm/pgalloc.c
+++ b/arch/s390/mm/pgalloc.c
@@ -412,7 +412,7 @@ void page_table_free_rcu(struct mmu_gather *tlb, unsigned long *table,
        }
        spin_unlock_bh(&mm->context.lock);
        table = (unsigned long *) ((unsigned long) table | (0x01U << bit));
-       tlb_remove_table(tlb, table);
+       tlb_remove_ptdesc(tlb, table);
 }
 
 void __tlb_remove_table(void *_table)