Merge branches 'x86/apic', 'x86/asm', 'x86/mm' and 'x86/platform' into x86/core,...

[linux-2.6-block.git] / arch / x86 / xen / enlighten.c

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index fe969ac1c65e771f62ee432b922bb7f6300fea0a..a8f57a94785ab714d63379c3f876b7d7d28f9130 100644 (file)
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1468,6 +1468,7 @@ asmlinkage __visible void __init xen_start_kernel(void)
 {
        struct physdev_set_iopl set_iopl;
        unsigned long initrd_start = 0;
+       u64 pat;
        int rc;
 
        if (!xen_start_info)
@@ -1575,8 +1576,8 @@ asmlinkage __visible void __init xen_start_kernel(void)
         * Modify the cache mode translation tables to match Xen's PAT
         * configuration.
         */
-
-       pat_init_cache_modes();
+       rdmsrl(MSR_IA32_CR_PAT, pat);
+       pat_init_cache_modes(pat);
 
        /* keep using Xen gdt for now; no urgent need to change it */