x86/mm: Remove Xen-PV leftovers from init_32.c
PATCH 1/1 x86/mm: Remove Xen-PV leftovers from init_32.c
There are still some unneeded paravirt calls in arch/x86/mm/init_32.c.
Remove them.
Signed-off-by Juergen Gross <[email protected]>
--- arch/x86/mm/init_32.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)
arch/x86/mm/init_32.c +2 -15
@@ -45,7 +45,6 @@#include <asm/olpc_ofw.h> #include <asm/pgalloc.h> #include <asm/sections.h> -#include <asm/paravirt.h> #include <asm/setup.h> #include <asm/set_memory.h> #include <asm/page_types.h>
@@ -74,7 +73,6 @@ static pmd_t * __init one_md_table_init(pgd_t *pgd)#ifdef CONFIG_X86_PAE if (!(pgd_val (*pgd) & _PAGE_PRESENT)) { pmd_table = (pmd_t *)alloc_low_page (); -paravirt_alloc_pmd (&init_mm,__pa (pmd_table) >>PAGE_SHIFT );set_pgd (pgd,__pgd (__pa (pmd_table) | _PAGE_PRESENT)); p4d =p4d_offset (pgd,0 ); pud =pud_offset (p4d,0 );
@@ -99,7 +97,6 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)if (!(pmd_val (*pmd) & _PAGE_PRESENT)) {pte_t *page_table = (pte_t *)alloc_low_page (); -paravirt_alloc_pte (&init_mm,__pa (page_table) >>PAGE_SHIFT );set_pmd (pmd,__pmd (__pa (page_table) | _PAGE_TABLE));BUG_ON (page_table !=pte_offset_kernel (pmd,0 )); }
@@ -181,12 +178,10 @@ static pte_t *__init page_table_kmap_check(pte_t *pte, pmd_t *pmd,set_pte (newpte + i, pte[i]); *adr = (void *)(((unsigned long )(*adr)) +PAGE_SIZE ); -paravirt_alloc_pte (&init_mm,__pa (newpte) >>PAGE_SHIFT );set_pmd (pmd,__pmd (__pa (newpte)|_PAGE_TABLE));BUG_ON (newpte !=pte_offset_kernel (pmd,0 ));__flush_tlb_all (); -paravirt_release_pte (__pa (pte) >>PAGE_SHIFT ); pte = newpte; } BUG_ON(vaddr < fix_to_virt(FIX_KMAP_BEGIN - 1)
@@ -482,7 +477,6 @@ void __init native_pagetable_init(void) pfn, pmd, __pa(pmd), pte, __pa(pte));pte_clear (NULL , va, pte); } -paravirt_alloc_pmd (&init_mm,__pa (base) >>PAGE_SHIFT );paging_init (); }
@@ -491,15 +485,8 @@ void __init native_pagetable_init(void)* point, we've been running on some set of pagetables constructed by * the boot process. * -* If we're booting on native hardware, this will be a pagetable -* constructed in arch/x86/kernel/head_32.S. The root of the -* pagetable will be swapper_pg_dir. -* -* If we're booting paravirtualized under a hypervisor, then there are -* more options: we may already be running PAE, and the pagetable may -* or may not be based in swapper_pg_dir. In any case, -* paravirt_pagetable_init() will set up swapper_pg_dir -* appropriately for the rest of the initialization to work. +* This will be a pagetable constructed in arch/x86/kernel/head_32.S. +* The root of the pagetable will be swapper_pg_dir. * * In general, pagetable_init() assumes that the pagetable may already * be partially populated, and so it avoids stomping on any existing
Signature · 1 line
2.35.3
The following commit has been merged into the x86/mm branch of tip:
The following commit has been merged into the x86/mm branch of tip:
Commit-ID: 78841cd185aa74bc92d3ac2c63a870395caaa086 Gitweb: https://git.kernel.org/tip/78841cd185aa74bc92d3ac2c63a870395caaa086 Author: Juergen Gross <[email protected]> AuthorDate: Fri, 09 Jun 2023 07:51:00 +02:00 Committer: Ingo Molnar <[email protected]> CommitterDate: Fri, 09 Jun 2023 11:00:21 +02:00
x86/mm: Remove Xen-PV leftovers from init_32.c
There are still some unneeded paravirt calls in arch/x86/mm/init_32.c.
Remove them.
Signed-off-by Juergen Gross <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/mm/init_32.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)
arch/x86/mm/init_32.c +2 -15
@@ -45,7 +45,6 @@#include <asm/olpc_ofw.h> #include <asm/pgalloc.h> #include <asm/sections.h> -#include <asm/paravirt.h> #include <asm/setup.h> #include <asm/set_memory.h> #include <asm/page_types.h>
@@ -74,7 +73,6 @@ static pmd_t * __init one_md_table_init(pgd_t *pgd)#ifdef CONFIG_X86_PAE if (!(pgd_val (*pgd) & _PAGE_PRESENT)) { pmd_table = (pmd_t *)alloc_low_page (); -paravirt_alloc_pmd (&init_mm,__pa (pmd_table) >>PAGE_SHIFT );set_pgd (pgd,__pgd (__pa (pmd_table) | _PAGE_PRESENT)); p4d =p4d_offset (pgd,0 ); pud =pud_offset (p4d,0 );
@@ -99,7 +97,6 @@ static pte_t * __init one_page_table_init(pmd_t *pmd)if (!(pmd_val (*pmd) & _PAGE_PRESENT)) {pte_t *page_table = (pte_t *)alloc_low_page (); -paravirt_alloc_pte (&init_mm,__pa (page_table) >>PAGE_SHIFT );set_pmd (pmd,__pmd (__pa (page_table) | _PAGE_TABLE));BUG_ON (page_table !=pte_offset_kernel (pmd,0 )); }
@@ -181,12 +178,10 @@ static pte_t *__init page_table_kmap_check(pte_t *pte, pmd_t *pmd,set_pte (newpte + i, pte[i]); *adr = (void *)(((unsigned long )(*adr)) +PAGE_SIZE ); -paravirt_alloc_pte (&init_mm,__pa (newpte) >>PAGE_SHIFT );set_pmd (pmd,__pmd (__pa (newpte)|_PAGE_TABLE));BUG_ON (newpte !=pte_offset_kernel (pmd,0 ));__flush_tlb_all (); -paravirt_release_pte (__pa (pte) >>PAGE_SHIFT ); pte = newpte; } BUG_ON(vaddr < fix_to_virt(FIX_KMAP_BEGIN - 1)
@@ -482,7 +477,6 @@ void __init native_pagetable_init(void) pfn, pmd, __pa(pmd), pte, __pa(pte));pte_clear (NULL , va, pte); } -paravirt_alloc_pmd (&init_mm,__pa (base) >>PAGE_SHIFT );paging_init (); }
@@ -491,15 +485,8 @@ void __init native_pagetable_init(void)* point, we've been running on some set of pagetables constructed by * the boot process. * -* If we're booting on native hardware, this will be a pagetable -* constructed in arch/x86/kernel/head_32.S. The root of the -* pagetable will be swapper_pg_dir. -* -* If we're booting paravirtualized under a hypervisor, then there are -* more options: we may already be running PAE, and the pagetable may -* or may not be based in swapper_pg_dir. In any case, -* paravirt_pagetable_init() will set up swapper_pg_dir -* appropriately for the rest of the initialization to work. +* This will be a pagetable constructed in arch/x86/kernel/head_32.S. +* The root of the pagetable will be swapper_pg_dir. * * In general, pagetable_init() assumes that the pagetable may already * be partially populated, and so it avoids stomping on any existing