[Xen-changelog] Only enable PGE in CR4 if the CPU supports the feature.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1765, 2005/06/28 09:09:04+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Only enable PGE in CR4 if the CPU supports the feature.
        Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>



 setup.c     |    2 +-
 x86_32/mm.c |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)


diff -Nru a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
--- a/xen/arch/x86/setup.c      2005-06-28 05:03:00 -04:00
+++ b/xen/arch/x86/setup.c      2005-06-28 05:03:00 -04:00
@@ -87,7 +87,7 @@
 #if CONFIG_PAGING_LEVELS > 2
 unsigned long mmu_cr4_features = X86_CR4_PSE | X86_CR4_PGE | X86_CR4_PAE;
 #else
-unsigned long mmu_cr4_features = X86_CR4_PSE | X86_CR4_PGE;
+unsigned long mmu_cr4_features = X86_CR4_PSE;
 #endif
 EXPORT_SYMBOL(mmu_cr4_features);
 
diff -Nru a/xen/arch/x86/x86_32/mm.c b/xen/arch/x86/x86_32/mm.c
--- a/xen/arch/x86/x86_32/mm.c  2005-06-28 05:03:00 -04:00
+++ b/xen/arch/x86/x86_32/mm.c  2005-06-28 05:03:00 -04:00
@@ -80,6 +80,7 @@
     if ( cpu_has_pge )
     {
         /* Suitable Xen mapping can be GLOBAL. */
+        set_in_cr4(X86_CR4_PGE);
         PAGE_HYPERVISOR         |= _PAGE_GLOBAL;
         PAGE_HYPERVISOR_NOCACHE |= _PAGE_GLOBAL;
         /* Transform early mappings (e.g., the frametable). */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog