Skip to content

Commit

Permalink
s390/mm: add missing conversion to use ptdescs
Browse files Browse the repository at this point in the history
Commit 6326c26 ("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>
  • Loading branch information
Alexander Gordeev authored and Vasily Gorbik committed Nov 5, 2023
1 parent e392ea4 commit 0547e0b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions arch/s390/include/asm/tlb.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/*
Expand All @@ -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);
}


Expand Down
2 changes: 1 addition & 1 deletion arch/s390/mm/pgalloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 0547e0b

Please sign in to comment.