Skip to content

Commit 66aebe5

Browse files
VMoolageertu
authored andcommitted
m68k: mm: Convert init_pointer_table() to use ptdescs
Motorola uses init_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 5bea646 commit 66aebe5

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

arch/m68k/mm/motorola.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ void __init init_pointer_table(void *table, int type)
121121
{
122122
ptable_desc *dp;
123123
unsigned long ptable = (unsigned long)table;
124-
unsigned long page = ptable & PAGE_MASK;
125-
unsigned int mask = 1U << ((ptable - page)/ptable_size(type));
124+
unsigned long pt_addr = ptable & PAGE_MASK;
125+
unsigned int mask = 1U << ((ptable - pt_addr)/ptable_size(type));
126126

127-
dp = PD_PTABLE(page);
127+
dp = PD_PTABLE(pt_addr);
128128
if (!(PD_MARKBITS(dp) & mask)) {
129129
PD_MARKBITS(dp) = ptable_mask(type);
130130
list_add(dp, &ptable_list[type]);
@@ -133,9 +133,9 @@ void __init init_pointer_table(void *table, int type)
133133
PD_MARKBITS(dp) &= ~mask;
134134
pr_debug("init_pointer_table: %lx, %x\n", ptable, PD_MARKBITS(dp));
135135

136-
/* unreserve the page so it's possible to free that page */
137-
__ClearPageReserved(PD_PAGE(dp));
138-
init_page_count(PD_PAGE(dp));
136+
/* unreserve the ptdesc so it's possible to free that ptdesc */
137+
__ClearPageReserved(ptdesc_page(PD_PTDESC(dp)));
138+
init_page_count(ptdesc_page(PD_PTDESC(dp)));
139139

140140
return;
141141
}

0 commit comments

Comments
 (0)