ia64/xen-unstable

changeset 5593:384059d92d3b

bitkeeper revision 1.1760.1.5 (42c105a0IGE_9KbvmOfox8TMahmQVw)

Only enable PGE in CR4 if the CPU supports the feature.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Tue Jun 28 08:09:04 2005 +0000 (2005-06-28)
parents b75294458106
children c2b00e4bfb8f
files xen/arch/x86/setup.c xen/arch/x86/x86_32/mm.c
line diff
     1.1 --- a/xen/arch/x86/setup.c	Tue Jun 28 08:08:24 2005 +0000
     1.2 +++ b/xen/arch/x86/setup.c	Tue Jun 28 08:09:04 2005 +0000
     1.3 @@ -87,7 +87,7 @@ struct cpuinfo_x86 boot_cpu_data = { 0, 
     1.4  #if CONFIG_PAGING_LEVELS > 2
     1.5  unsigned long mmu_cr4_features = X86_CR4_PSE | X86_CR4_PGE | X86_CR4_PAE;
     1.6  #else
     1.7 -unsigned long mmu_cr4_features = X86_CR4_PSE | X86_CR4_PGE;
     1.8 +unsigned long mmu_cr4_features = X86_CR4_PSE;
     1.9  #endif
    1.10  EXPORT_SYMBOL(mmu_cr4_features);
    1.11  
     2.1 --- a/xen/arch/x86/x86_32/mm.c	Tue Jun 28 08:08:24 2005 +0000
     2.2 +++ b/xen/arch/x86/x86_32/mm.c	Tue Jun 28 08:09:04 2005 +0000
     2.3 @@ -80,6 +80,7 @@ void __init paging_init(void)
     2.4      if ( cpu_has_pge )
     2.5      {
     2.6          /* Suitable Xen mapping can be GLOBAL. */
     2.7 +        set_in_cr4(X86_CR4_PGE);
     2.8          PAGE_HYPERVISOR         |= _PAGE_GLOBAL;
     2.9          PAGE_HYPERVISOR_NOCACHE |= _PAGE_GLOBAL;
    2.10          /* Transform early mappings (e.g., the frametable). */