Skip to content

Commit 5bea646

Browse files
VMoolageertu
authored andcommitted
m68k: mm: Convert free_pointer_table() to use ptdescs
Motorola uses free_pointer_table() for page tables, so it should be using struct ptdesc, not struct page. This helps us prepare to allocate ptdescs as their own memory descriptor, and prepares to remove a user of page->lru. Signed-off-by: "Vishal Moola (Oracle)" <[email protected]> Reviewed-by: Geert Uytterhoeven <[email protected]> Link: https://lore.kernel.org/[email protected] Signed-off-by: Geert Uytterhoeven <[email protected]>
1 parent 72fe6da commit 5bea646

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

arch/m68k/mm/motorola.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -202,21 +202,20 @@ int free_pointer_table(void *table, int type)
202202
{
203203
ptable_desc *dp;
204204
unsigned long ptable = (unsigned long)table;
205-
unsigned long page = ptable & PAGE_MASK;
206-
unsigned int mask = 1U << ((ptable - page)/ptable_size(type));
205+
unsigned long pt_addr = ptable & PAGE_MASK;
206+
unsigned int mask = 1U << ((ptable - pt_addr)/ptable_size(type));
207207

208-
dp = PD_PTABLE(page);
208+
dp = PD_PTABLE(pt_addr);
209209
if (PD_MARKBITS (dp) & mask)
210210
panic ("table already free!");
211211

212212
PD_MARKBITS (dp) |= mask;
213213

214214
if (PD_MARKBITS(dp) == ptable_mask(type)) {
215-
/* all tables in page are free, free page */
215+
/* all tables in ptdesc are free, free ptdesc */
216216
list_del(dp);
217-
mmu_page_dtor((void *)page);
218-
pagetable_dtor(virt_to_ptdesc((void *)page));
219-
free_page (page);
217+
mmu_page_dtor((void *)pt_addr);
218+
pagetable_dtor_free(virt_to_ptdesc((void *)pt_addr));
220219
return 1;
221220
} else if (ptable_list[type].next != dp) {
222221
/*

0 commit comments

Comments
 (0)