From c7fb9c901b956a076f3ecf5ebdfeb3014476c67d Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 25 Jul 2002 22:07:35 -0700 Subject: [PATCH] Clean up more x86 MM init details after splitup --- arch/i386/mm/init.c | 2 +- arch/i386/mm/pgtable.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c index 6b81a9c9e0ec..23b997cd5d5e 100644 --- a/arch/i386/mm/init.c +++ b/arch/i386/mm/init.c @@ -249,9 +249,9 @@ static void __init pagetable_init (void) { unsigned long vaddr; pgd_t *pgd_base = swapper_pg_dir; - int i; #if CONFIG_X86_PAE + int i; /* Init entries of the first-level page table to the zero page */ for (i = 0; i < PTRS_PER_PGD; i++) set_pgd(pgd_base + i, __pgd(__pa(empty_zero_page) | _PAGE_PRESENT)); diff --git a/arch/i386/mm/pgtable.c b/arch/i386/mm/pgtable.c index 8a9e03c6fbf3..72769eb878eb 100644 --- a/arch/i386/mm/pgtable.c +++ b/arch/i386/mm/pgtable.c @@ -52,7 +52,7 @@ void show_mem(void) * Associate a virtual page frame with a given physical page frame * and protection flags for that frame. */ -static void set_pte_phys (unsigned long vaddr, unsigned long phys, pgprot_t flags) +static void set_pte_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags) { pgd_t *pgd; pmd_t *pmd; @@ -69,8 +69,8 @@ static void set_pte_phys (unsigned long vaddr, unsigned long phys, pgprot_t flag return; } pte = pte_offset_kernel(pmd, vaddr); - /* stored as-is, to permit clearing entries */ - set_pte(pte, pfn_pte(phys >> PAGE_SHIFT, flags)); + /* stored as-is, to permit clearing entries */ + set_pte(pte, pfn_pte(pfn, flags)); /* * It's enough to flush this one mapping. @@ -87,7 +87,7 @@ void __set_fixmap (enum fixed_addresses idx, unsigned long phys, pgprot_t flags) BUG(); return; } - set_pte_phys(address, phys, flags); + set_pte_pfn(address, phys >> PAGE_SHIFT, flags); } pte_t *pte_alloc_one_kernel(struct mm_struct *mm, unsigned long address) -- 2.39.5