[pve-devel] r6534 - pve-kernel-2.6.32-rh/trunk

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-09-09 06:56:45 +0200 (Fri, 09 Sep 2011)
New Revision: 6534

Added:
   pve-kernel-2.6.32-rh/trunk/fix-aspm-policy.patch
Modified:
   pve-kernel-2.6.32-rh/trunk/Makefile
   pve-kernel-2.6.32-rh/trunk/changelog.Debian
Log:
use BIOS default settings for ASMP (fix-aspm-policy.patch)


Modified: pve-kernel-2.6.32-rh/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32-rh/trunk/Makefile	2011-09-08 10:45:57 UTC (rev 6533)
+++ pve-kernel-2.6.32-rh/trunk/Makefile	2011-09-09 04:56:45 UTC (rev 6534)
@@ -1,7 +1,7 @@
 RELEASE=1.8
 
 KERNEL_VER=2.6.32
-PKGREL=41
+PKGREL=42
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=6
@@ -139,6 +139,7 @@
 	cd ${KERNEL_SRC}; patch -p1 <../do-not-use-barrier-on-ext3.patch
 	cd ${KERNEL_SRC}; patch -p1 <../fix-register-corruption-in-pvclock-scale-delta.patch
 	cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
+	cd ${KERNEL_SRC}; patch -p1 <../fix-aspm-policy.patch
 	sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
 	touch $@
 

Modified: pve-kernel-2.6.32-rh/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32-rh/trunk/changelog.Debian	2011-09-08 10:45:57 UTC (rev 6533)
+++ pve-kernel-2.6.32-rh/trunk/changelog.Debian	2011-09-09 04:56:45 UTC (rev 6534)
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-42) unstable; urgency=low
+
+  * use BIOS default settings for ASMP (fix-aspm-policy.patch)
+
+ -- Proxmox Support Team <support at proxmox.com>  Fri, 09 Sep 2011 06:56:05 +0200
+
 pve-kernel-2.6.32 (2.6.32-41) unstable; urgency=low
 
   * include ISCSITARGET driver 

Added: pve-kernel-2.6.32-rh/trunk/fix-aspm-policy.patch
===================================================================
--- pve-kernel-2.6.32-rh/trunk/fix-aspm-policy.patch	                        (rev 0)
+++ pve-kernel-2.6.32-rh/trunk/fix-aspm-policy.patch	2011-09-09 04:56:45 UTC (rev 6534)
@@ -0,0 +1,11 @@
+--- linux-2.6-2.6.32/drivers/pci/pcie/aspm.c.org	2011-09-09 06:51:53.000000000 +0200
++++ linux-2.6-2.6.32/drivers/pci/pcie/aspm.c	2011-09-09 06:52:09.000000000 +0200
+@@ -75,7 +75,7 @@
+ #define POLICY_DEFAULT 0	/* BIOS default setting */
+ #define POLICY_PERFORMANCE 1	/* high performance */
+ #define POLICY_POWERSAVE 2	/* high power saving */
+-static int aspm_policy = POLICY_POWERSAVE;
++static int aspm_policy = POLICY_DEFAULT;
+ static const char *policy_str[] = {
+ 	[POLICY_DEFAULT] = "default",
+ 	[POLICY_PERFORMANCE] = "performance",