4level support for m32r
PATCH 8/17 4level support for m32r
4level support for m32r
m32r converted
Signed-off-by Andi Kleen <[email protected]>
arch/m32r/mm/init.c +13 -0
@@ -248,3 +248,16 @@ void free_initrd_mem(unsigned long start }#endif + +/* +* Allocate and free page tables. +*/ +pgd_t *__pgd_alloc (struct mm_struct *mm,pml4_t *pml4,unsigned long addr) +{ +pgd_t *pgd = (pgd_t *)__get_free_page (GFP_KERNEL ); + +if (pgd) +clear_page (pgd); + +return pgd; +}
arch/m32r/mm/ioremap.c +1 -1
@@ -86,7 +86,7 @@ remap_area_pages(unsigned long address,unsigned long end = address + size; phys_addr -= address; - dir =pgd_offset (&init_mm, address); + dir =pml4_pgd_offset_k (pml4_offset_k (address), address);flush_cache_all ();if (address >= end)BUG ();
include/asm-m32r/mmu_context.h +2 -2
@@ -133,8 +133,8 @@ static __inline__ void switch_mm(struct#ifdef CONFIG_SMP cpu_set (cpu, next->cpu_vm_mask);#endif /* CONFIG_SMP */ -/* Set MPTB = next->pgd */ - *(volatile unsigned long *)MPTB = (unsigned long )next->pgd; +/* Set MPTB = next->pml4 */ + *(volatile unsigned long *)MPTB = (unsigned long )next->pml4;activate_context (next); }#ifdef CONFIG_SMP
include/asm-m32r/page.h +2 -0
@@ -106,6 +106,8 @@ static __inline__ int get_order(unsigned#define devmem_is_allowed (x) 1 +#include <asm-generic/nopml4-page.h> +#endif /* __KERNEL__ */ #endif /* _ASM_M32R_PAGE_H */
include/asm-m32r/pgalloc.h +2 -13
@@ -18,19 +18,6 @@ static __inline__ void pmd_populate(struset_pmd (pmd,__pmd (_PAGE_TABLE +page_to_phys (pte))); } -/* -* Allocate and free page tables. -*/ -static __inline__pgd_t *pgd_alloc (struct mm_struct *mm) -{ -pgd_t *pgd = (pgd_t *)__get_free_page (GFP_KERNEL ); - -if (pgd) -clear_page (pgd); - -return pgd; -} -static __inline__void pgd_free (pgd_t *pgd) {free_page ((unsigned long )pgd);
@@ -83,5 +70,7 @@ static __inline__ void pte_free(struct p#define check_pgt_cache () do { } while (0) +#include <asm-generic/nopml4-pgalloc.h> +#endif /* _ASM_M32R_PGALLOC_H */
include/asm-m32r/pgtable.h +4 -5
@@ -54,7 +54,7 @@ extern unsigned long empty_zero_page[102#define PGDIR_SIZE (1UL << PGDIR_SHIFT)#define PGDIR_MASK (~(PGDIR_SIZE - 1)) -#define USER_PTRS_PER_PGD (TASK_SIZE / PGDIR_SIZE) +#define USER_PGDS_IN_LAST_PML4 (TASK_SIZE / PGDIR_SIZE)#define FIRST_USER_PGD_NR 0#ifndef __ASSEMBLY__
@@ -377,10 +377,7 @@ static __inline__ void pmd_set(pmd_t * p#define pgd_index (address) \ (((address) >> PGDIR_SHIFT) & (PTRS_PER_PGD - 1)) -#define pgd_offset (mm, address) ((mm)->pgd + pgd_index(address)) - -/* to find an entry in a kernel page-table-directory */ -#define pgd_offset_k (address) pgd_offset(&init_mm, address) +#define pgd_index_k (addr) pgd_index(addr)#define pmd_index (address) \ (((address) >> PMD_SHIFT) & (PTRS_PER_PMD - 1))
@@ -419,5 +416,7 @@ static __inline__ void pmd_set(pmd_t * p#define __HAVE_ARCH_PTE_SAME#include <asm-generic/pgtable.h> +#include <asm-generic/nopml4-pgtable.h> +#endif /* _ASM_M32R_PGTABLE_H */
PATCH 1/1 m32r: Update 4-level page table support (was Re: [PATCH 8/17] 4level support for m32r)
Hello,
More updates for 4-level support for m32r.
This patch is needed to fix compile error of -mm tree for m32r. Please apply.
Regards,
Signed-off-by Hirokazu Takata <[email protected]>
---
arch/m32r/mm/fault.c +2 -2
@@ -122,7 +122,7 @@ asmlinkage void do_page_fault(struct pt_/* * We fault-in kernel-space virtual memory on-demand. The -* 'reference' page table is init_mm.pgd. +* 'reference' page table is init_mm.pml4. * * NOTE! We MUST NOT take any locks for this case. We may * be in an interrupt or a critical region, and should
@@ -343,7 +343,7 @@ vmalloc_fault: pgd = (pgd_t *)*(unsigned long *)MPTB ; pgd = offset + (pgd_t *)pgd; - pgd_k = init_mm.pgd + offset; + pgd_k = init_mm.pml4 + offset;if (!pgd_present (*pgd_k)) goto no_context;
arch/m32r/mm/init.c +1 -1
@@ -142,7 +142,7 @@ void __init paging_init(void)/* We don't need kernel mapping as hardware support that. */ pg_dir = swapper_pg_dir; -for (i =0 ; i <USER_PTRS_PER_PGD *2 ; i++) +for (i =0 ; i <USER_PGDS_IN_LAST_PML4 *2 ; i++)pgd_val (pg_dir[i]) =0 ;#endif /* CONFIG_MMU */ hole_pages =zone_sizes_init ();
--
Hirokazu Takata <[email protected]>
Linux/M32R Project: http://www.linux-m32r.org/