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

[svn-commits at proxmox.com]

Author: dietmar
Date: 2010-11-26 05:25:21 +0000 (Fri, 26 Nov 2010)
New Revision: 5320

Removed:
   pve-kernel-2.6.32/trunk/fix-veth-coredump-openvz-bug-1634.diff
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	2010-11-26 04:47:45 UTC (rev 5319)
+++ pve-kernel-2.6.32/trunk/Makefile	2010-11-26 05:25:21 UTC (rev 5320)
@@ -140,6 +140,7 @@
 	#cd ${KERNEL_SRC}; patch -p1 <../scst-src/scst/kernel/readahead-2.6.32.patch
 	cd ${KERNEL_SRC}; patch -p1 <../put_page_callback-2.6.32.patch
 	cd ${KERNEL_SRC}; patch -p1 <../fix-veth-coredump-openvz-bug-1634.diff
+	asda
 	sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
 	touch $@
 

Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian	2010-11-26 04:47:45 UTC (rev 5319)
+++ pve-kernel-2.6.32/trunk/changelog.Debian	2010-11-26 05:25:21 UTC (rev 5320)
@@ -1,6 +1,6 @@
 pve-kernel-2.6.32 (2.6.32-28) unstable; urgency=low
 
-  * upgarde to debian squeeze kernel 2.6.32-28 (openvz 2.6.32-dzhanibekov)
+  * upgarde to debian squeeze kernel 2.6.32-28 (openvz 2.6.32-dzhanibekov) 
   
   * update igb driver to version 2.4.8
   

Deleted: pve-kernel-2.6.32/trunk/fix-veth-coredump-openvz-bug-1634.diff
===================================================================
--- pve-kernel-2.6.32/trunk/fix-veth-coredump-openvz-bug-1634.diff	2010-11-26 04:47:45 UTC (rev 5319)
+++ pve-kernel-2.6.32/trunk/fix-veth-coredump-openvz-bug-1634.diff	2010-11-26 05:25:21 UTC (rev 5320)
@@ -1,40 +0,0 @@
-From: Andrey Vagin <avagin at openvz.org>
-Date: Fri, 8 Oct 2010 08:18:39 +0000 (+0400)
-Subject: net: release dst entry while cache-hot for GSO case too
-X-Git-Tag: v2.6.32-dzhanibekov~7
-X-Git-Url: http://git.openvz.org/?p=linux-2.6.32-openvz;a=commitdiff_plain;h=12b9937d06add8bcd3304d7c1e47707b4becaf8e;hp=6909d4328e3766709e40f6cbcb7fc2a8f3718fc8
-
-net: release dst entry while cache-hot for GSO case too
-
-Non-GSO code drops dst entry for performance reasons, but
-the same is missing for GSO code. Drop dst while cache-hot
-for GSO case too.
-
-this patch has been backported from mainstream because of
-http://bugzilla.openvz.org/show_bug.cgi?id=1634
-
-Signed-off-by: Krishna Kumar <krkumar2 at in.ibm.com>
-Acked-by: Eric Dumazet <eric.dumazet at gmail.com>
-Signed-off-by: David S. Miller <davem at davemloft.net>
-Signed-off-by: Andrey Vagin <avagin at openvz.org>
-Signed-off-by: Pavel Emelyanov <xemul at openvz.org>
----
-
-diff --git a/net/core/dev.c b/net/core/dev.c
-index 57a9f40..49adb56 100644
---- a/net/core/dev.c
-+++ b/net/core/dev.c
-@@ -1757,6 +1757,13 @@ gso:
- 		skb->next = nskb->next;
- 		nskb->next = NULL;
- 
-+		/*
-+		 * If device doesnt need nskb->dst, release it right now while
-+		 * its hot in this cpu cache
-+		 */
-+		if (dev->priv_flags & IFF_XMIT_DST_RELEASE)
-+			skb_dst_drop(nskb);
-+
- 		bridge_hard_start_xmit(skb, dev);
- 
- 		rc = ops->ndo_start_xmit(nskb, dev);