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

[svn-commits at proxmox.com]

Author: dietmar
Date: 2011-06-24 06:50:20 +0200 (Fri, 24 Jun 2011)
New Revision: 6143

Added:
   pve-kernel-2.6.32/trunk/fix-register-corruption-in-pvclock-scale-delta.patch
Modified:
   pve-kernel-2.6.32/trunk/Makefile
   pve-kernel-2.6.32/trunk/changelog.Debian
Log:


Modified: pve-kernel-2.6.32/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32/trunk/Makefile	2011-06-24 04:40:36 UTC (rev 6142)
+++ pve-kernel-2.6.32/trunk/Makefile	2011-06-24 04:50:20 UTC (rev 6143)
@@ -1,7 +1,7 @@
 RELEASE=1.8
 
 KERNEL_VER=2.6.32
-PKGREL=34
+PKGREL=35
 # alsp include priv firmware into the fw package  fwlist-2.6.32-PREV-pve
 KREL=5
 
@@ -143,6 +143,7 @@
 	tar xf ${KERNEL_SRC_TAR}	
 	zcat ${KERNEL_DEB_DIFF}|patch -p1 -d ${KERNEL_SRC}
 	./applydebpatches.pl ${KERNEL_SRC} ${KERNEL_DEB_REL}
+	cd ${KERNEL_SRC}; patch -p1 <../fix-register-corruption-in-pvclock-scale-delta.patch
 	#cd ${KERNEL_SRC}; patch -p1 <../use-init-task-credential.patch
 	cd ${KERNEL_SRC}; patch -p1 <../bootsplash-3.1.9-2.6.31.patch 
 	cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff

Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian	2011-06-24 04:40:36 UTC (rev 6142)
+++ pve-kernel-2.6.32/trunk/changelog.Debian	2011-06-24 04:50:20 UTC (rev 6143)
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-35) unstable; urgency=low
+
+  * fix register corruption in pvclock_scale_delta
+
+ -- Proxmox Support Team <support at proxmox.com>  Wed, 22 Jun 2011 10:55:29 +0200
+
 pve-kernel-2.6.32 (2.6.32-34) unstable; urgency=low
 
   * update to debian squeeze kernel 2.6.32-35

Added: pve-kernel-2.6.32/trunk/fix-register-corruption-in-pvclock-scale-delta.patch
===================================================================
--- pve-kernel-2.6.32/trunk/fix-register-corruption-in-pvclock-scale-delta.patch	                        (rev 0)
+++ pve-kernel-2.6.32/trunk/fix-register-corruption-in-pvclock-scale-delta.patch	2011-06-24 04:50:20 UTC (rev 6143)
@@ -0,0 +1,42 @@
+From: Zachary Amsden <zamsden at redhat.com>
+Date: Thu, 16 Jun 2011 03:50:04 +0000 (-0700)
+Subject: KVM: Fix register corruption in pvclock_scale_delta
+X-Git-Url: http://git.kernel.org/?p=virt%2Fkvm%2Fkvm.git;a=commitdiff_plain;h=eaa6a665a3c0fb5f8dbf25bca02eae5594095f4f
+
+KVM: Fix register corruption in pvclock_scale_delta
+
+The 128-bit multiply in pvclock.h was missing an output constraint for
+EDX which caused a register corruption to appear.  Thanks to Ulrich for
+diagnosing the EDX corruption and Avi for providing this fix.
+
+Signed-off-by: Zachary Amsden <zamsden at redhat.com>
+Signed-off-by: Avi Kivity <avi at redhat.com>
+---
+
+diff --git a/arch/x86/include/asm/pvclock.h b/arch/x86/include/asm/pvclock.h
+index 31d84ac..a518c0a 100644
+--- a/arch/x86/include/asm/pvclock.h
++++ b/arch/x86/include/asm/pvclock.h
+@@ -22,6 +22,8 @@ static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift)
+ 	u64 product;
+ #ifdef __i386__
+ 	u32 tmp1, tmp2;
++#else
++	ulong tmp;
+ #endif
+ 
+ 	if (shift < 0)
+@@ -42,8 +44,11 @@ static inline u64 pvclock_scale_delta(u64 delta, u32 mul_frac, int shift)
+ 		: "a" ((u32)delta), "1" ((u32)(delta >> 32)), "2" (mul_frac) );
+ #elif defined(__x86_64__)
+ 	__asm__ (
+-		"mul %%rdx ; shrd $32,%%rdx,%%rax"
+-		: "=a" (product) : "0" (delta), "d" ((u64)mul_frac) );
++		"mul %[mul_frac] ; shrd $32, %[hi], %[lo]"
++		: [lo]"=a"(product),
++		  [hi]"=d"(tmp)
++		: "0"(delta),
++		  [mul_frac]"rm"((u64)mul_frac));
+ #else
+ #error implement me!
+ #endif