From 2549fa57708d81a4e8e740d5b377972d026a33d4 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 29 Jul 2003 11:42:12 +0000 Subject: [PATCH] Small cleanups including deletion of two variables 4k each ... --- arch/mips/kernel/head.S | 14 ++++++++------ arch/mips/kernel/offset.c | 5 ++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S index 47d18b67df1..1cb9d6fe124 100644 --- a/arch/mips/kernel/head.S +++ b/arch/mips/kernel/head.S @@ -189,18 +189,20 @@ NESTED(smp_bootstrap, 16, sp) * Here we only have a two-level pagetable structure ... */ page swapper_pg_dir, _PGD_ORDER - page empty_bad_page, 0 - page empty_bad_page_table, 0 - page invalid_pte_table, 0 + page invalid_pte_table, _PTE_ORDER #endif #ifdef CONFIG_MIPS64 /* * ... but on 64-bit we've got three-level pagetables with a * slightly different layout ... */ - page swapper_pg_dir, 1 - page invalid_pte_table, 0 - page invalid_pmd_table, 1 + page swapper_pg_dir, _PGD_ORDER + page invalid_pmd_table, _PMD_ORDER + page invalid_pte_table, _PTE_ORDER + + /* + * 64-bit kernel mappings are really screwed up ... + */ page kptbl, _PGD_ORDER .globl ekptbl page kpmdtbl, 0 diff --git a/arch/mips/kernel/offset.c b/arch/mips/kernel/offset.c index 995cd4b2c74..867c5e4a6dd 100644 --- a/arch/mips/kernel/offset.c +++ b/arch/mips/kernel/offset.c @@ -214,10 +214,13 @@ void output_mm_defines(void) constant("#define _PAGE_SIZE ", PAGE_SIZE); constant("#define _PAGE_SHIFT ", PAGE_SHIFT); linefeed; - constant("#define _PGD_ORDER ", PGD_ORDER); constant("#define _PGDIR_SHIFT ", PGDIR_SHIFT); constant("#define _PMD_SHIFT ", PMD_SHIFT); linefeed; + constant("#define _PGD_ORDER ", PGD_ORDER); + constant("#define _PMD_ORDER ", PMD_ORDER); + constant("#define _PTE_ORDER ", PTE_ORDER); + linefeed; constant("#define _PTRS_PER_PGD ", PTRS_PER_PGD); constant("#define _PTRS_PER_PMD ", PTRS_PER_PMD); linefeed; -- 2.11.4.GIT