On Wed, 2008-11-05 at 15:20 +0100, Bastian Blank wrote: > On Wed, Nov 05, 2008 at 03:15:38PM +0100, Bastian Blank wrote: > > On Wed, Nov 05, 2008 at 02:50:32PM +0100, Bastian Blank wrote: > > > On Wed, Nov 05, 2008 at 01:10:30PM +0000, Ian Campbell wrote: > > > > On Wed, 2008-11-05 at 10:05 +0000, Ian Campbell wrote: > > > > > > What happens if you use "nopat" to disable the usage of PAT? > > > > > CONFIG_X86_PAT is disabled anyway so it makes no difference. > > > > Although it does turn out that PAT is implicated... > > > Ah. > > Shorter patch. Tries to use the compiler instead of the preprocessor. > > Even shorter.
I think the minimum is attached, but this wouldn't give a build failure if a usage snuck in. I'm happy with any of the variants. -- Ian Campbell Eat drink and be merry, for tomorrow they may make it illegal.
Index: sid-xen/include/asm-x86/mach-xen/asm/pgtable.h =================================================================== --- sid-xen.orig/include/asm-x86/mach-xen/asm/pgtable.h 2008-11-05 13:07:33.000000000 +0000 +++ sid-xen/include/asm-x86/mach-xen/asm/pgtable.h 2008-11-05 14:08:15.000000000 +0000 @@ -74,5 +74,5 @@ * 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) Index: sid-xen/arch/x86/Kconfig =================================================================== --- sid-xen.orig/arch/x86/Kconfig 2008-11-05 13:07:33.000000000 +0000 +++ sid-xen/arch/x86/Kconfig 2008-11-05 14:08:15.000000000 +0000 @@ -1141,6 +1141,7 @@ bool prompt "x86 PAT support" depends on MTRR + depends on !XEN help Use PAT attributes to setup page level cache control.