26 lines
929 B
Diff
26 lines
929 B
Diff
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
|
|
index 170d743..ae1e15b 100644
|
|
--- a/arch/x86/Kconfig
|
|
+++ b/arch/x86/Kconfig
|
|
@@ -1141,6 +1141,7 @@ config X86_PAT
|
|
bool
|
|
prompt "x86 PAT support"
|
|
depends on MTRR
|
|
+ depends on !XEN
|
|
help
|
|
Use PAT attributes to setup page level cache control.
|
|
|
|
diff --git a/include/asm-x86/mach-xen/asm/pgtable.h b/include/asm-x86/mach-xen/asm/pgtable.h
|
|
index a9ff073..3c37ff4 100644
|
|
--- a/include/asm-x86/mach-xen/asm/pgtable.h
|
|
+++ b/include/asm-x86/mach-xen/asm/pgtable.h
|
|
@@ -74,7 +74,7 @@ extern unsigned int __kernel_page_user;
|
|
* PAT settings are part of the hypervisor interface, which sets the
|
|
* MSR to 0x050100070406 (i.e. WB, WT, UC-, UC, WC, WP [, UC, UC]).
|
|
*/
|
|
-#define _PAGE_CACHE_MASK (_PAGE_PCD | _PAGE_PWT | _PAGE_PAT)
|
|
+#define _PAGE_CACHE_MASK (_PAGE_PCD | _PAGE_PWT)
|
|
#define _PAGE_CACHE_WB (0)
|
|
#define _PAGE_CACHE_WT (_PAGE_PWT)
|
|
#define _PAGE_CACHE_WC (_PAGE_PAT)
|