From: Andi Kleen s390/s390x works with 3 levels (thanks to Martin S.) Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton --- 25-akpm/arch/s390/mm/init.c | 20 ++++++++++++++++++++ 25-akpm/arch/s390/mm/ioremap.c | 2 +- 25-akpm/include/asm-s390/mmu_context.h | 4 ++-- 25-akpm/include/asm-s390/page.h | 2 ++ 25-akpm/include/asm-s390/pgalloc.h | 21 ++------------------- 25-akpm/include/asm-s390/pgtable.h | 23 +++++++++++------------ 25-akpm/include/asm-s390/tlbflush.h | 2 +- 7 files changed, 39 insertions(+), 35 deletions(-) diff -puN arch/s390/mm/init.c~4level-architecture-changes-for-s390 arch/s390/mm/init.c --- 25/arch/s390/mm/init.c~4level-architecture-changes-for-s390 2004-11-03 21:53:23.207539992 -0800 +++ 25-akpm/arch/s390/mm/init.c 2004-11-03 21:53:23.220538016 -0800 @@ -40,6 +40,26 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_ga pgd_t swapper_pg_dir[PTRS_PER_PGD] __attribute__((__aligned__(PAGE_SIZE))); char empty_zero_page[PAGE_SIZE] __attribute__((__aligned__(PAGE_SIZE))); +pgd_t * +__pgd_alloc(struct mm_struct *mm, pml4_t *dummy, unsigned long addr) +{ + pgd_t *pgd; + int i; + +#ifndef __s390x__ + pgd = (pgd_t *) __get_free_pages(GFP_KERNEL,1); + if (pgd != NULL) + for (i = 0; i < PTRS_PER_PGD; i++) + pmd_clear(pmd_offset(pgd + i, i*PGDIR_SIZE)); +#else /* __s390x__ */ + pgd = (pgd_t *) __get_free_pages(GFP_KERNEL,2); + if (pgd != NULL) + for (i = 0; i < PTRS_PER_PGD; i++) + pgd_clear(pgd + i); +#endif /* __s390x__ */ + return pgd; +} + void diag10(unsigned long addr) { if (addr >= 0x7ff00000) diff -puN arch/s390/mm/ioremap.c~4level-architecture-changes-for-s390 arch/s390/mm/ioremap.c --- 25/arch/s390/mm/ioremap.c~4level-architecture-changes-for-s390 2004-11-03 21:53:23.208539840 -0800 +++ 25-akpm/arch/s390/mm/ioremap.c 2004-11-03 21:53:23.220538016 -0800 @@ -76,7 +76,7 @@ static int remap_area_pages(unsigned lon unsigned long end = address + size; phys_addr -= address; - dir = pgd_offset(&init_mm, address); + dir = pml4_pgd_offset(&init_mm, address); flush_cache_all(); if (address >= end) BUG(); diff -puN include/asm-s390/mmu_context.h~4level-architecture-changes-for-s390 include/asm-s390/mmu_context.h --- 25/include/asm-s390/mmu_context.h~4level-architecture-changes-for-s390 2004-11-03 21:53:23.210539536 -0800 +++ 25-akpm/include/asm-s390/mmu_context.h 2004-11-03 21:53:23.221537864 -0800 @@ -26,13 +26,13 @@ static inline void switch_mm(struct mm_s { if (prev != next) { #ifndef __s390x__ - S390_lowcore.user_asce = (__pa(next->pgd)&PAGE_MASK) | + S390_lowcore.user_asce = (__pa(next->pml4)&PAGE_MASK) | (_SEGMENT_TABLE|USER_STD_MASK); /* Load home space page table origin. */ asm volatile("lctl 13,13,%0" : : "m" (S390_lowcore.user_asce) ); #else /* __s390x__ */ - S390_lowcore.user_asce = (__pa(next->pgd) & PAGE_MASK) | + S390_lowcore.user_asce = (__pa(next->pml4) & PAGE_MASK) | (_REGION_TABLE|USER_STD_MASK); /* Load home space page table origin. */ asm volatile("lctlg 13,13,%0" diff -puN include/asm-s390/page.h~4level-architecture-changes-for-s390 include/asm-s390/page.h --- 25/include/asm-s390/page.h~4level-architecture-changes-for-s390 2004-11-03 21:53:23.211539384 -0800 +++ 25-akpm/include/asm-s390/page.h 2004-11-03 21:53:23.221537864 -0800 @@ -200,6 +200,8 @@ page_get_storage_key(unsigned long addr) #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#include + #endif /* __KERNEL__ */ #endif /* _S390_PAGE_H */ diff -puN include/asm-s390/pgalloc.h~4level-architecture-changes-for-s390 include/asm-s390/pgalloc.h --- 25/include/asm-s390/pgalloc.h~4level-architecture-changes-for-s390 2004-11-03 21:53:23.213539080 -0800 +++ 25-akpm/include/asm-s390/pgalloc.h 2004-11-03 21:53:23.222537712 -0800 @@ -29,25 +29,6 @@ extern void diag10(unsigned long addr); * if any. */ -static inline pgd_t *pgd_alloc(struct mm_struct *mm) -{ - pgd_t *pgd; - int i; - -#ifndef __s390x__ - pgd = (pgd_t *) __get_free_pages(GFP_KERNEL,1); - if (pgd != NULL) - for (i = 0; i < USER_PTRS_PER_PGD; i++) - pmd_clear(pmd_offset(pgd + i, i*PGDIR_SIZE)); -#else /* __s390x__ */ - pgd = (pgd_t *) __get_free_pages(GFP_KERNEL,2); - if (pgd != NULL) - for (i = 0; i < PTRS_PER_PGD; i++) - pgd_clear(pgd + i); -#endif /* __s390x__ */ - return pgd; -} - static inline void pgd_free(pgd_t *pgd) { #ifndef __s390x__ @@ -164,4 +145,6 @@ static inline void pte_free(struct page */ #define set_pgdir(addr,entry) do { } while(0) +#include + #endif /* _S390_PGALLOC_H */ diff -puN include/asm-s390/pgtable.h~4level-architecture-changes-for-s390 include/asm-s390/pgtable.h --- 25/include/asm-s390/pgtable.h~4level-architecture-changes-for-s390 2004-11-03 21:53:23.215538776 -0800 +++ 25-akpm/include/asm-s390/pgtable.h 2004-11-03 21:53:23.223537560 -0800 @@ -90,15 +90,15 @@ extern char empty_zero_page[PAGE_SIZE]; * pgd entries used up by user/kernel: */ #ifndef __s390x__ -# define USER_PTRS_PER_PGD 512 -# define USER_PGD_PTRS 512 -# define KERNEL_PGD_PTRS 512 -# define FIRST_USER_PGD_NR 0 +# define USER_PGDS_IN_LAST_PML4 512 +# define USER_PGD_PTRS 512 +# define KERNEL_PGD_PTRS 512 +# define FIRST_USER_PGD_NR 0 #else /* __s390x__ */ -# define USER_PTRS_PER_PGD 2048 -# define USER_PGD_PTRS 2048 -# define KERNEL_PGD_PTRS 2048 -# define FIRST_USER_PGD_NR 0 +# define USER_PGDS_IN_LAST_PML4 2048 +# define USER_PGD_PTRS 2048 +# define KERNEL_PGD_PTRS 2048 +# define FIRST_USER_PGD_NR 0 #endif /* __s390x__ */ #define pte_ERROR(e) \ @@ -680,10 +680,7 @@ static inline pte_t mk_pte_phys(unsigned /* to find an entry in a page-table-directory */ #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(address) pgd_index(address) #ifndef __s390x__ @@ -798,5 +795,7 @@ extern inline pte_t mk_swap_pte(unsigned #define __HAVE_ARCH_PAGE_TEST_AND_CLEAR_YOUNG #include +#include + #endif /* _S390_PAGE_H */ diff -puN include/asm-s390/tlbflush.h~4level-architecture-changes-for-s390 include/asm-s390/tlbflush.h --- 25/include/asm-s390/tlbflush.h~4level-architecture-changes-for-s390 2004-11-03 21:53:23.216538624 -0800 +++ 25-akpm/include/asm-s390/tlbflush.h 2004-11-03 21:53:23.223537560 -0800 @@ -105,7 +105,7 @@ static inline void __flush_tlb_mm(struct if (MACHINE_HAS_IDTE) { asm volatile (".insn rrf,0xb98e0000,0,%0,%1,0" : : "a" (2048), - "a" (__pa(mm->pgd)&PAGE_MASK) : "cc" ); + "a" (__pa(mm->pml4)&PAGE_MASK) : "cc" ); return; } preempt_disable(); _