1 files changed, 9 insertions, 1 deletions

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 39928d16be3b..c8e1c7b95c3b 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -67,6 +67,7 @@
 #include <asm/hypervisor.h>
 #include <asm/mwait.h>
 #include <asm/pci_x86.h>
+#include <asm/pat.h>
 
 #ifdef CONFIG_ACPI
 #include <linux/acpi.h>
@@ -1417,7 +1418,14 @@ asmlinkage void __init xen_start_kernel(void)
          */
         acpi_numa = -1;
 #endif
-
+#ifdef CONFIG_X86_PAT
+        /*
+         * For right now disable the PAT. We should remove this once
+         * git commit 8eaffa67b43e99ae581622c5133e20b0f48bcef1
+         * (xen/pat: Disable PAT support for now) is reverted.
+         */
+        pat_enabled = 0;
+#endif
         /* Don't do the full vcpu_info placement stuff until we have a
            possible map and a non-dummy shared_info. */
         per_cpu(xen_vcpu, 0) = &HYPERVISOR_shared_info->vcpu_info[0];