[pve-devel] r5233 - pve-kernel-2.6.32/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-10-07 08:54:43 +0000 (Thu, 07 Oct 2010)
New Revision: 5233

Modified:
   pve-kernel-2.6.32/trunk/Makefile
   pve-kernel-2.6.32/trunk/README
   pve-kernel-2.6.32/trunk/changelog.Debian
   pve-kernel-2.6.32/trunk/config-2.6.32.diff
Log:


Modified: pve-kernel-2.6.32/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32/trunk/Makefile	2010-10-07 08:49:38 UTC (rev 5232)
+++ pve-kernel-2.6.32/trunk/Makefile	2010-10-07 08:54:43 UTC (rev 5233)
@@ -3,7 +3,7 @@
 KERNEL_VER=2.6.32
 KERNEL_DEB_REL=22
 
-PKGREL=20
+PKGREL=21
 KREL=4
 
 EXTRAVERSION=-${KREL}-pve

Modified: pve-kernel-2.6.32/trunk/README
===================================================================
--- pve-kernel-2.6.32/trunk/README	2010-10-07 08:49:38 UTC (rev 5232)
+++ pve-kernel-2.6.32/trunk/README	2010-10-07 08:54:43 UTC (rev 5233)
@@ -85,9 +85,12 @@
   	 CONFIG_HAVE_INTEL_TXT=y
 	 CONFIG_INTEL_TXT=y
 	 CONFIG_DMAR=y
-	 CONFIG_DMAR_DEFAULT_ON=y
 	 CONFIG_PCI_STUB=y
 
+  We do not enable DMAR by default (CONFIG_DMAR_DEFAULT_ON=n), because
+  several users reported problems with that option. You can still
+  eanble it using intel_iommu=on boot option.
+
 - enable zero copy patch for SCST
 	 CONFIG_TCP_ZERO_COPY_TRANSFER_COMPLETION_NOTIFICATION=y
 

Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian	2010-10-07 08:49:38 UTC (rev 5232)
+++ pve-kernel-2.6.32/trunk/changelog.Debian	2010-10-07 08:54:43 UTC (rev 5233)
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-21) unstable; urgency=low
+
+  * do not set CONFIG_DMAR_DEFAULT_ON
+
+ -- Proxmox Support Team <support at proxmox.com>  Thu, 07 Oct 2010 10:43:55 +0200
+
 pve-kernel-2.6.32 (2.6.32-20) unstable; urgency=low
 
   * enable CAPIDRV module

Modified: pve-kernel-2.6.32/trunk/config-2.6.32.diff
===================================================================
--- pve-kernel-2.6.32/trunk/config-2.6.32.diff	2010-10-07 08:49:38 UTC (rev 5232)
+++ pve-kernel-2.6.32/trunk/config-2.6.32.diff	2010-10-07 08:54:43 UTC (rev 5233)
@@ -1,14 +1,5 @@
 --- config-2.6.32.org	2010-09-15 12:04:33.000000000 +0200
-+++ config-2.6.32	2010-10-05 10:47:57.000000000 +0200
-@@ -486,7 +486,7 @@
- CONFIG_PCI_MMCONFIG=y
- CONFIG_PCI_DOMAINS=y
- CONFIG_DMAR=y
--# CONFIG_DMAR_DEFAULT_ON is not set
-+CONFIG_DMAR_DEFAULT_ON=y
- CONFIG_DMAR_FLOPPY_WA=y
- CONFIG_INTR_REMAP=y
- CONFIG_PCIEPORTBUS=y
++++ config-2.6.32	2010-10-07 10:46:15.000000000 +0200
 @@ -500,7 +500,7 @@
  CONFIG_PCI_MSI=y
  CONFIG_PCI_LEGACY=y