--- v3
+++ v4
@@ -13,7 +13,7 @@
3 files changed, 27 insertions(+), 26 deletions(-)
diff --git a/arch/m68k/include/asm/mcf_pgalloc.h b/arch/m68k/include/asm/mcf_pgalloc.h
-index 5c2c0a864524..9eb4ef9e6d77 100644
+index 5c2c0a864524..857949ac9431 100644
--- a/arch/m68k/include/asm/mcf_pgalloc.h
+++ b/arch/m68k/include/asm/mcf_pgalloc.h
@@ -7,20 +7,19 @@
@@ -37,7 +37,7 @@
- memset((void *)page, 0, PAGE_SIZE);
- return (pte_t *) (page);
-+ return (pte_t *) (ptdesc_address(ptdesc));
++ return ptdesc_address(ptdesc);
}
extern inline pmd_t *pmd_alloc_kernel(pgd_t *pgd, unsigned long address)
@@ -81,7 +81,7 @@
static inline void pte_free(struct mm_struct *mm, pgtable_t pgtable)
{
- struct page *page = virt_to_page(pgtable);
-+ struct ptdesc *ptdesc = virt_to_ptdesc(ptdesc);
++ struct ptdesc *ptdesc = virt_to_ptdesc(pgtable);
- pgtable_pte_page_dtor(page);
- __free_page(page);
@@ -107,7 +107,7 @@
- if (!new_pgd)
+ if (!ptdesc)
return NULL;
-+ new_pgd = (pgd_t *) ptdesc_address(ptdesc);
++ new_pgd = ptdesc_address(ptdesc);
+
memcpy(new_pgd, swapper_pg_dir, PTRS_PER_PGD * sizeof(pgd_t));
memset(new_pgd, 0, PAGE_OFFSET >> PGDIR_SHIFT);