direct-io.hg

changeset 4514:9cd7410879ef

bitkeeper revision 1.1292 (425bb9faHQQUfDwFTjREYNlMMXUsEg)

unecessary variable rename which lead to unecessary changes between mainline and xen

Signed-off-by: Vincent Hanquez <vincent@xensource.com>
author vh249@arcadians.cl.cam.ac.uk
date Tue Apr 12 12:07:22 2005 +0000 (2005-04-12)
parents 0af94d69263f
children 5e994310f44f
files linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c
line diff
     1.1 --- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c	Tue Apr 12 10:57:13 2005 +0000
     1.2 +++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c	Tue Apr 12 12:07:22 2005 +0000
     1.3 @@ -326,8 +326,8 @@ extern void __init remap_numa_kva(void);
     1.4  static void __init pagetable_init (void)
     1.5  {
     1.6  	unsigned long vaddr;
     1.7 +	pgd_t *pgd_base = swapper_pg_dir;
     1.8  	pgd_t *old_pgd = (pgd_t *)xen_start_info.pt_base;
     1.9 -	pgd_t *new_pgd = swapper_pg_dir;
    1.10  
    1.11  #ifdef CONFIG_X86_PAE
    1.12  	int i;
    1.13 @@ -353,16 +353,16 @@ static void __init pagetable_init (void)
    1.14  	 * page directory, write-protect the new page directory, then switch to
    1.15  	 * it. We clean up by write-enabling and then freeing the old page dir.
    1.16  	 */
    1.17 -	memcpy(new_pgd, old_pgd, PTRS_PER_PGD_NO_HV*sizeof(pgd_t));
    1.18 -	make_page_readonly(new_pgd);
    1.19 -	xen_pgd_pin(__pa(new_pgd));
    1.20 -	load_cr3(new_pgd);
    1.21 +	memcpy(pgd_base, old_pgd, PTRS_PER_PGD_NO_HV*sizeof(pgd_t));
    1.22 +	make_page_readonly(pgd_base);
    1.23 +	xen_pgd_pin(__pa(pgd_base));
    1.24 +	load_cr3(pgd_base);
    1.25  	xen_pgd_unpin(__pa(old_pgd));
    1.26  	make_page_writable(old_pgd);
    1.27  	__flush_tlb_all();
    1.28  	free_bootmem(__pa(old_pgd), PAGE_SIZE);
    1.29  
    1.30 -	kernel_physical_mapping_init(new_pgd);
    1.31 +	kernel_physical_mapping_init(pgd_base);
    1.32  	remap_numa_kva();
    1.33  
    1.34  	/*
    1.35 @@ -370,9 +370,9 @@ static void __init pagetable_init (void)
    1.36  	 * created - mappings will be set by set_fixmap():
    1.37  	 */
    1.38  	vaddr = __fix_to_virt(__end_of_fixed_addresses - 1) & PMD_MASK;
    1.39 -	page_table_range_init(vaddr, 0, new_pgd);
    1.40 +	page_table_range_init(vaddr, 0, pgd_base);
    1.41  
    1.42 -	permanent_kmaps_init(new_pgd);
    1.43 +	permanent_kmaps_init(pgd_base);
    1.44  
    1.45  #ifdef CONFIG_X86_PAE
    1.46  	/*
    1.47 @@ -382,7 +382,7 @@ static void __init pagetable_init (void)
    1.48  	 * All user-space mappings are explicitly cleared after
    1.49  	 * SMP startup.
    1.50  	 */
    1.51 -	new_pgd[0] = new_pgd[USER_PTRS_PER_PGD];
    1.52 +	pgd_base[0] = pgd_base[USER_PTRS_PER_PGD];
    1.53  #endif
    1.54  }
    1.55