[kernel] r12374 - in dists/sid/linux-2.6/debian: . patches/features/all/xen patches/series

[Bastian Blank]

Author: waldi
Date: Wed Nov  5 16:53:56 2008
New Revision: 12374

Log:
* debian/changelog: Update.
* debian/patches/features/all/xen/disable-pat.patch: Add.
* debian/patches/series/10-extra: Add new patch.


Added:
   dists/sid/linux-2.6/debian/patches/features/all/xen/disable-pat.patch
   dists/sid/linux-2.6/debian/patches/series/10-extra
Modified:
   dists/sid/linux-2.6/debian/changelog

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Wed Nov  5 16:53:56 2008
@@ -39,6 +39,9 @@
     - x86: Reserve FIRST_DEVICE_VECTOR in used_vectors bitmap.
   * [xen] Remove pte file workaround.
 
+  [ Ian Campbell ]
+  * [xen] Disable usage of PAT. (closes: #503821)
+
  -- dann frazier <dannf at debian.org>  Mon, 20 Oct 2008 23:27:25 -0600
 
 linux-2.6 (2.6.26-9) unstable; urgency=low

Added: dists/sid/linux-2.6/debian/patches/features/all/xen/disable-pat.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/features/all/xen/disable-pat.patch	Wed Nov  5 16:53:56 2008
@@ -0,0 +1,25 @@
+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)

Added: dists/sid/linux-2.6/debian/patches/series/10-extra
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/series/10-extra	Wed Nov  5 16:53:56 2008
@@ -0,0 +1 @@
++ features/all/xen/disable-pat.patch featureset=xen