ia64/xen-unstable

changeset 6309:4e0d8361a538

Fix PAE boot.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Sat Aug 20 10:01:20 2005 +0000 (2005-08-20)
parents 7733176cc821
children 40d68c7d62d0
files Config.mk linux-2.6-xen-sparse/arch/xen/i386/mm/init.c
line diff
     1.1 --- a/Config.mk	Sat Aug 20 09:38:32 2005 +0000
     1.2 +++ b/Config.mk	Sat Aug 20 10:01:20 2005 +0000
     1.3 @@ -3,7 +3,7 @@
     1.4  # Currently supported architectures: x86_32, x86_64
     1.5  XEN_COMPILE_ARCH    ?= $(shell uname -m | sed -e s/i.86/x86_32/)
     1.6  XEN_TARGET_ARCH     ?= $(XEN_COMPILE_ARCH)
     1.7 -XEN_TARGET_X86_PAE  ?= n
     1.8 +XEN_TARGET_X86_PAE  ?= y
     1.9  
    1.10  # Tools to run on system hosting the build
    1.11  HOSTCC     = gcc
     2.1 --- a/linux-2.6-xen-sparse/arch/xen/i386/mm/init.c	Sat Aug 20 09:38:32 2005 +0000
     2.2 +++ b/linux-2.6-xen-sparse/arch/xen/i386/mm/init.c	Sat Aug 20 10:01:20 2005 +0000
     2.3 @@ -352,13 +352,6 @@ static void __init pagetable_init (void)
     2.4  	swapper_pg_dir = pgd_base;
     2.5  	init_mm.pgd    = pgd_base;
     2.6  
     2.7 -#ifdef CONFIG_X86_PAE
     2.8 -	int i;
     2.9 -	/* Init entries of the first-level page table to the zero page */
    2.10 -	for (i = 0; i < PTRS_PER_PGD; i++)
    2.11 -		set_pgd(pgd_base + i, __pgd(__pa(empty_zero_page) | _PAGE_PRESENT));
    2.12 -#endif
    2.13 -
    2.14  	/* Enable PSE if available */
    2.15  	if (cpu_has_pse) {
    2.16  		set_in_cr4(X86_CR4_PSE);
    2.17 @@ -383,17 +376,6 @@ static void __init pagetable_init (void)
    2.18  	page_table_range_init(vaddr, 0, pgd_base);
    2.19  
    2.20  	permanent_kmaps_init(pgd_base);
    2.21 -
    2.22 -#if 0 /* def CONFIG_X86_PAE */
    2.23 -	/*
    2.24 -	 * Add low memory identity-mappings - SMP needs it when
    2.25 -	 * starting up on an AP from real-mode. In the non-PAE
    2.26 -	 * case we already have these mappings through head.S.
    2.27 -	 * All user-space mappings are explicitly cleared after
    2.28 -	 * SMP startup.
    2.29 -	 */
    2.30 -	set_pgd(&pgd_base[0], pgd_base[USER_PTRS_PER_PGD]);
    2.31 -#endif
    2.32  }
    2.33  
    2.34  #if defined(CONFIG_PM_DISK) || defined(CONFIG_SOFTWARE_SUSPEND)