Bump RHEL patched kernel. Drop old patches and unused ebuild.

Package-Manager: portage-2.2_rc51/cvs/Linux i686

11 files changed, 61 insertions, 387 deletions

diff --git a/sys-kernel/openvz-sources/ChangeLog b/sys-kernel/openvz-sources/ChangeLog
index 68a3bce0f5aa..13ee0c489109 100644
--- a/sys-kernel/openvz-sources/ChangeLog
+++ b/sys-kernel/openvz-sources/ChangeLog
@@ -1,6 +1,20 @@
 # ChangeLog for sys-kernel/openvz-sources
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.121 2009/11/12 19:43:39 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/ChangeLog,v 1.122 2009/11/26 19:12:49 pva Exp $
+
+*openvz-sources-2.6.18.028.066.7 (26 Nov 2009)
+
+  26 Nov 2009; Peter Volkov <pva@gentoo.org>
+  +openvz-sources-2.6.18.028.066.7.ebuild,
+  -openvz-sources-2.6.27.2.1-r3.ebuild,
+  -files/openvz-sources-2.6.27.2.1-SLAB.patch,
+  -files/openvz-sources-2.6.27.2.1-avoid-double-free.patch,
+  -files/openvz-sources-2.6.27.2.1-ban-netns-creation.patch,
+  -files/openvz-sources-2.6.27.2.1-bridge-process-skbs.patch,
+  -files/openvz-sources-2.6.27.2.1-bridge-set_via_phys_dev_state.patch,
+  -files/openvz-sources-2.6.27.2.1-check-for-no-mmaps.patch,
+  -files/openvz-sources-2.6.27.2.1-pi-futex-pid-check-fixup.patch:
+  Bump RHEL patched kernel. Drop old patches and unused ebuild.
 
   12 Nov 2009; Peter Volkov <pva@gentoo.org>
   openvz-sources-2.6.27.2.1-r4.ebuild:
diff --git a/sys-kernel/openvz-sources/Manifest b/sys-kernel/openvz-sources/Manifest
index 7ac67995849d..196cbe1eaf05 100644
--- a/sys-kernel/openvz-sources/Manifest
+++ b/sys-kernel/openvz-sources/Manifest
@@ -1,21 +1,14 @@
 AUX openvz-sources-2.6.18.028.064.7-bridgemac.patch 514 RMD160 bdd04c4dc86c79b91b7675d8c59b569483e444c4 SHA1 ef092a68c4dab7dc7284b2be8cc74b1510def485 SHA256 250bc852aedca35624d9352c1d693e147812504b2799cd2ba20f0c9763e61908
 AUX openvz-sources-2.6.18.028.064.7-cifs-buildfix.patch 24766 RMD160 eb1bc2fa2455aef6d6fec88ef393cc295f8c1761 SHA1 d41347ea67fb684243760c6c93a07cbc74ca9049 SHA256 581a2366559f077aabe1d7dcd1e64b312d537d2ffff1b94c609ef2d3980e2973
 AUX openvz-sources-2.6.18.028.064.7-syscall.patch 1076 RMD160 3ea449e7e7c53e94e3723c16f3715ee3651eafd4 SHA1 f636eec4cd72183f5581420aef35c139ffce1971 SHA256 89a2111ef8e0cff2b078a025b43a685c3a8d7bb7dab1c6f2991ef3b13d8051ee
-AUX openvz-sources-2.6.27.2.1-SLAB.patch 3849 RMD160 dda122170b3124c9ed1bc92b39ec07eee0651d76 SHA1 9c36e56271500b9974fc56bb937a0defeef80fb8 SHA256 d96fe971332c095ebabe3875403389aca561be86eee8123f6e15e6bf61a2734d
-AUX openvz-sources-2.6.27.2.1-avoid-double-free.patch 746 RMD160 56c953b85e61a9d92fb3fa9afa97f9278713b223 SHA1 b092cba443192d441ed1260e78a7d6846db0bc3c SHA256 2ebd2b63b1acdd09933420fd2d7beec751b4363c513a4192a9bdab3550fa0f7b
-AUX openvz-sources-2.6.27.2.1-ban-netns-creation.patch 1451 RMD160 fb5dd54761508624a3d9a7567206054b55549c46 SHA1 57f6de1ca6bbf9854739b976191de6f12b04c411 SHA256 5ac15c60dbfca7abcb5644c013270270eec375f6197bdf36f3006e38010561f7
-AUX openvz-sources-2.6.27.2.1-bridge-process-skbs.patch 1089 RMD160 2343167ce9242024d9595b08973a44e9b638e822 SHA1 14edbad4478df0d1eccf2d2f0afe37331d25b3f6 SHA256 aed10e5e25e4627e2335c97d5b41901d531f938e110195bd65faaede2b0b14ec
-AUX openvz-sources-2.6.27.2.1-bridge-set_via_phys_dev_state.patch 1413 RMD160 f7321f8d51ba524b92f7e6db407072a05b0700a0 SHA1 450d529efc2117e8d619ec71f81309a89175bb4c SHA256 51ba7b026f9cea151359bbb102f011f6b56dbbf9aeeb1d4cd6393edb034b0d69
-AUX openvz-sources-2.6.27.2.1-check-for-no-mmaps.patch 853 RMD160 123b7c31b027770229c794414ac50f6e3a0e9f2d SHA1 0f93121aaa4dd4590f8e9853b39c3bc7b76f84d7 SHA256 8fa6994fed7c67c08c3cd0f8c0de0cfd604e7af39c53a210b6c82bf0d35994d2
-AUX openvz-sources-2.6.27.2.1-pi-futex-pid-check-fixup.patch 850 RMD160 7e09373594e7e0907eee302e30b174de4bed0245 SHA1 d2e58e07f8364cfc1277c1df655766dc2cb4929f SHA256 0c6513efeca40f1966a933687d52ba17aca6ccb58b6bc03dce7f18101c98f0c7
 DIST linux-2.6.18.tar.bz2 41863580 RMD160 f92283f956880676bfb1f1d5288325461e4e02e7 SHA1 178f7d5bb3af0978d42b37651b8753323c7129c2 SHA256 c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d
-DIST linux-2.6.27-openvz-2.6.27.37-merge.patch.bz2 117991 RMD160 ebb4f80613ad0ad724e7be4fb0b1e09b86d92c18 SHA1 0d135645b12fff71177530e97bf879bddb305d04 SHA256 d62a1ac74458bb0d50eaad3d5847dac1d56452c748ccb870f107d32611d3d623
 DIST linux-2.6.27-openvz-2.6.27.39-merge.patch.bz2 125355 RMD160 bdec55d284fe27568a9153502540da8ee6ccdfe8 SHA1 22802f652a48e80c9c14e9ed6a8d0060f39e64e6 SHA256 66f5041636d9c161fa5df558f4958e76aa3dfd65c83fd7556e1aa3521fa0045c
 DIST linux-2.6.27.tar.bz2 50355835 RMD160 5be4595ad824a4af67c1ec0c692838ad0c31f0c0 SHA1 8425ec3be2652f9d511911ff4fcf99039d4574be SHA256 0e99bf9e83f4d1ae0c656741a84dfddfa9c4d2469cf35475f5939d02dc3e4393
 DIST patch-128.2.1.el5.028stab064.8-combined.gz 13207088 RMD160 06c77bf61905720a5ef5fbab2b117f5ad21299c9 SHA1 45c077168330e156dc2c27e62b25eea1aa2fa2ea SHA256 29a4546dc80f463a1c109cb0a6ccfc275bbdd93f635aa6446a7bf7e48b849f2c
+DIST patch-164.2.1.el5.028stab066.7-combined.gz 15438000 RMD160 45715a2210bfebd2ff0a797d25c91f002ddd93bd SHA1 936ff93d595b2b34bc0a16e69db811b20e3424bc SHA256 faf58e806bef81c7902e7c53348efb2b52bc1c75287c785c7441ea6de51ac269
 DIST patch-briullov.1-combined.gz 919351 RMD160 5d49786c302a0e50b8d965037b4a28c2bd6c97b8 SHA1 10ecb9f6b89e3c68939383ef4ee8f069ad4abd60 SHA256 ea3369b84299b82b3983d48154d86a8275335f03d1c07cd15db8b6adc41bf4d7
 EBUILD openvz-sources-2.6.18.028.064.8.ebuild 1936 RMD160 ec571a9736fd062f217c5e129baa17030d624e43 SHA1 63bd404bca3aef516b6f56be4de94bb4d14aa9e5 SHA256 27c1389369e7cc5ef6a4b52a6dd2251e3dee2f848a6b1444184e462ba35e9d2f
-EBUILD openvz-sources-2.6.27.2.1-r3.ebuild 1904 RMD160 cbd34d234d8ec44b56f679ef6fc8d04dba5c3249 SHA1 7fa4baf16ec72068b2364d93b78843f1955c6e2a SHA256 eb1d8108d1cdd51e01e7bcd55c7697c8c3305950f3eb97e404ca5e96424f2800
+EBUILD openvz-sources-2.6.18.028.066.7.ebuild 1832 RMD160 002fba7c873036e71772d4522184f75fcd44ea9a SHA1 e5ce9b8a9e260f5a680c017fd10c4d23062c67f2 SHA256 afffe97620503737057e03af21e33cd3a897fec84839749337267fe8cdd76cf8
 EBUILD openvz-sources-2.6.27.2.1-r4.ebuild 1904 RMD160 2010a15e241a7e6b1e9119d86646d65d72fd72b2 SHA1 b9838826f614721951909f582299c6b4d808d9fe SHA256 cb2415a4de6261ecd3c3e80315bac8babcd7cfc917fca51109a675308ec135d5
-MISC ChangeLog 30569 RMD160 98f315806313ea7c22c4b566bd1cd4acf588575c SHA1 ac38d764ebb6f1bc7f9fa196dcee863c8c64be54 SHA256 ecc21901e8a8ff4602403ac576fa6d0cd1fbe278846d374aaa1d478abd991210
+MISC ChangeLog 31240 RMD160 37898cc7ebd13a1e8848121229a3cec05d881203 SHA1 f817b73bdde65c24e33e5066f78882a7b69e2063 SHA256 e81af821c3ebf5a849e6b40104f69c653334c9f1ccfa29879cd04748d0788a42
 MISC metadata.xml 554 RMD160 0d62a03694a7c0e0caa538a603b3a41916451887 SHA1 d4d18f1c2c52425a1a819ac0d76ff1c906853047 SHA256 78f7ce5323a1a18773d5a6a01cffcc729fb51f4a667b5d2df37450907a007a31
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-SLAB.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-SLAB.patch
deleted file mode 100644
index 818425498bc8..000000000000
--- a/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-SLAB.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From: Cyrill Gorcunov <gorcunov@openvz.org>
-Date: Thu, 16 Jul 2009 15:22:21 +0000 (+0400)
-Subject: lab: kmem_cache - fixup members and use helpers
-X-Git-Url: http://git.openvz.org/?p=linux-2.6.27-openvz;a=commitdiff_plain;h=36d3fafb956540b300aa12218bcb7e9db3c5e656
-
-lab: kmem_cache - fixup members and use helpers
-
-In a sake of SLAB memory manager usability we need
-to add beancounter members and use proper helpers.
-
-[ bug http://bugzilla.openvz.org/show_bug.cgi?id=1232 ]
-
-Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
----
-
-diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
-index de03bd0..1da5551 100644
---- a/include/linux/slab_def.h
-+++ b/include/linux/slab_def.h
-@@ -15,6 +15,8 @@
- #include <asm/cache.h>		/* kmalloc_sizes.h needs L1_CACHE_BYTES */
- #include <linux/compiler.h>
- 
-+struct kmem_cache;
-+
- /*
-  * DEBUG	- 1 for kmem_cache_create() to honour; SLAB_RED_ZONE & SLAB_POISON.
-  *		  0 for faster, smaller code (especially in the critical paths).
-diff --git a/kernel/pid_namespace.c b/kernel/pid_namespace.c
-index 3f004b7..46a1726 100644
---- a/kernel/pid_namespace.c
-+++ b/kernel/pid_namespace.c
-@@ -184,8 +184,8 @@ static int __pid_ns_attach_task(struct pid_namespace *ns,
- 	for (type = 0; type < PIDTYPE_MAX; ++type)
- 		INIT_HLIST_HEAD(&pid->tasks[type]);
- 
--	old_size = pid->numbers[pid->level - 1].ns->pid_cachep->objuse;
--	new_size = pid->numbers[pid->level].ns->pid_cachep->objuse;
-+	old_size = kmem_cache_objuse(pid->numbers[pid->level - 1].ns->pid_cachep);
-+	new_size = kmem_cache_objuse(pid->numbers[pid->level].ns->pid_cachep);
- 	local_irq_disable();
- 	/*
- 	 * Depending on sizeof(struct foo), cache flags (redzoning, etc)
-diff --git a/mm/slab.c b/mm/slab.c
-index 8d27032..730fe63 100644
---- a/mm/slab.c
-+++ b/mm/slab.c
-@@ -399,12 +399,13 @@ struct kmem_cache {
- 	struct list_head next;
- 
- /* 6) statistics */
--#if STATS
-+#if SLAB_STATS
- 	unsigned long num_active;
- 	unsigned long num_allocations;
- 	unsigned long high_mark;
- 	unsigned long grown;
- 	unsigned long reaped;
-+	unsigned long shrunk;
- 	unsigned long errors;
- 	unsigned long max_freeable;
- 	unsigned long node_allocs;
-@@ -415,7 +416,7 @@ struct kmem_cache {
- 	atomic_t freehit;
- 	atomic_t freemiss;
- #endif
--#if DEBUG
-+#if SLAB_DEBUG
- 	/*
- 	 * If debugging is enabled, then the allocator can add additional
- 	 * fields and/or padding to every object. buffer_size contains the total
-@@ -425,6 +426,9 @@ struct kmem_cache {
- 	int obj_offset;
- 	int obj_size;
- #endif
-+#ifdef CONFIG_BEANCOUNTERS
-+	int objuse;
-+#endif
- 	/*
- 	 * We put nodelists[] at the end of kmem_cache, because we want to size
- 	 * this array to nr_node_ids slots instead of MAX_NUMNODES
-@@ -452,11 +456,11 @@ struct kmem_cache {
- #define REAPTIMEOUT_CPUC	(2*HZ)
- #define REAPTIMEOUT_LIST3	(4*HZ)
- 
-+#if SLAB_STATS
- #define	STATS_INC_GROWN(x)	((x)->grown++)
- #define	STATS_ADD_REAPED(x,y)	((x)->reaped += (y))
- #define	STATS_INC_SHRUNK(x)	((x)->shrunk++)
- 
--#if SLAB_STATS
- #define	STATS_INC_ACTIVE(x)	((x)->num_active++)
- #define	STATS_DEC_ACTIVE(x)	((x)->num_active--)
- #define	STATS_INC_ALLOCED(x)	((x)->num_allocations++)
-@@ -479,6 +483,9 @@ struct kmem_cache {
- #define STATS_INC_FREEHIT(x)	atomic_inc(&(x)->freehit)
- #define STATS_INC_FREEMISS(x)	atomic_inc(&(x)->freemiss)
- #else
-+#define	STATS_INC_GROWN(x)	do { } while (0)
-+#define	STATS_ADD_REAPED(x,y)	do { } while (0)
-+#define	STATS_INC_SHRUNK(x)	do { } while (0)
- #define	STATS_INC_ACTIVE(x)	do { } while (0)
- #define	STATS_DEC_ACTIVE(x)	do { } while (0)
- #define	STATS_INC_ALLOCED(x)	do { } while (0)
-@@ -841,8 +848,12 @@ int kmem_dname_objuse(void *obj)
- 
- unsigned long ub_cache_growth(struct kmem_cache *cachep)
- {
-+#if SLAB_STATS
- 	return (cachep->grown - cachep->reaped - cachep->shrunk)
- 		<< cachep->gfporder;
-+#else
-+	return 0;
-+#endif
- }
- 
- #define slab_ubcs(cachep, slabp) ((struct user_beancounter **)\
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-avoid-double-free.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-avoid-double-free.patch
deleted file mode 100644
index 755bd4ed67e8..000000000000
--- a/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-avoid-double-free.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Pavel Emelyanov <xemul@openvz.org>
-Date: Wed, 22 Apr 2009 15:05:03 +0000 (+0400)
-Subject: net: avoid double free on net->gen pointer on error
-X-Git-Url: http://git.openvz.org/?p=linux-2.6.27-openvz;a=commitdiff_plain;h=4f908925f495ea1e2f401b8fcf3cdc91c5968429
-
-net: avoid double free on net->gen pointer on error
-
-If we failed with netns creation net->gen will be kfree-ed twice.
-
-http://bugzilla.openvz.org/show_bug.cgi?id=1241
-
-Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
----
-
-diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c
-index 523eba0..64b0a40 100644
---- a/net/core/net_namespace.c
-+++ b/net/core/net_namespace.c
-@@ -75,6 +75,7 @@ out_undo:
- 	}
- 
- 	rcu_barrier();
-+	net->gen = NULL;
- 	kfree(ng);
- 	goto out;
- }
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-ban-netns-creation.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-ban-netns-creation.patch
deleted file mode 100644
index 49191ce427f3..000000000000
--- a/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-ban-netns-creation.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: Pavel Emelyanov <xemul@openvz.org>
-Date: Fri, 10 Apr 2009 11:22:09 +0000 (+0400)
-Subject: namespaces: ban netns creation even for ve0's root
-X-Git-Url: http://git.openvz.org/?p=linux-2.6.27-openvz;a=commitdiff_plain;h=5728d99a5ae464d533487ef5874a3f9ea9ff2097
-
-namespaces: ban netns creation even for ve0's root
-
-netnamespace do not work with sysfs yet, so creating one
-can be fatal
-
-http://bugzilla.openvz.org/show_bug.cgi?id=1234
-
-Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
----
-
-diff --git a/kernel/nsproxy.c b/kernel/nsproxy.c
-index 052b894..25288ad 100644
---- a/kernel/nsproxy.c
-+++ b/kernel/nsproxy.c
-@@ -142,9 +142,20 @@ int copy_namespaces(unsigned long flags, struct task_struct *tsk,
- 				CLONE_NEWUSER | CLONE_NEWPID | CLONE_NEWNET)))
- 		return 0;
- 
--	if (!capable(CAP_SYS_ADMIN) && !force_admin) {
--		err = -EPERM;
--		goto out;
-+	if (!force_admin) {
-+		if (!capable(CAP_SYS_ADMIN)) {
-+			err = -EPERM;
-+			goto out;
-+		}
-+
-+		/*
-+		 * netns-vs-sysfs is deadly broken, thus new namespace
-+		 * (even in ve0) can bring the node down
-+		 */
-+		if (flags & CLONE_NEWNET) {
-+			err = -EINVAL;
-+			goto out;
-+		}
- 	}
- 
- 	/*
-@@ -221,6 +232,9 @@ int unshare_nsproxy_namespaces(unsigned long unshare_flags,
- 	if (!capable(CAP_SYS_ADMIN))
- 		return -EPERM;
- 
-+	if (unshare_flags & CLONE_NEWNET)
-+		return -EINVAL;
-+
- 	*new_nsp = create_new_namespaces(unshare_flags, current,
- 				new_fs ? new_fs : current->fs);
- 	if (IS_ERR(*new_nsp)) {
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-bridge-process-skbs.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-bridge-process-skbs.patch
deleted file mode 100644
index be6606477f61..000000000000
--- a/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-bridge-process-skbs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Cyrill Gorcunov <gorcunov@openvz.org>
-Date: Tue, 21 Apr 2009 12:00:07 +0000 (+0400)
-Subject: net: bridge - process skbs has been already substituted due to via_phys_dev
-X-Git-Url: http://git.openvz.org/?p=linux-2.6.27-openvz;a=commitdiff_plain;h=ac9403982e62e2eb33ec19264d2d389f09034320
-
-net: bridge - process skbs has been already substituted due to via_phys_dev
-
-When via_phys_dev is enabled we substitute skb->dev with
-master_dev and pass it back to bridge code. Instead of
-dropping such skb we should pass it up to network stack
-to process.
-
-Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
-Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
----
-
-diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
-index 44fb444..1a650ac 100644
---- a/net/bridge/br_input.c
-+++ b/net/bridge/br_input.c
-@@ -160,7 +160,7 @@ struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb)
- 		/* fall through */
- 	case BR_STATE_LEARNING:
- 		if (skb->brmark == BR_ALREADY_SEEN)
--			return 0;
-+			return skb;
- 
- 		out = p->br->via_phys_dev ? p->br->master_dev : p->br->dev;
- 
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-bridge-set_via_phys_dev_state.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-bridge-set_via_phys_dev_state.patch
deleted file mode 100644
index de6d70522188..000000000000
--- a/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-bridge-set_via_phys_dev_state.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Cyrill Gorcunov <gorcunov@openvz.org>
-Date: Tue, 7 Apr 2009 17:59:25 +0000 (+0400)
-Subject: net: bridge - set_via_phys_dev_state should return int value
-X-Git-Url: http://git.openvz.org/?p=linux-2.6.27-openvz;a=commitdiff_plain;h=649958ef9120ebea8ed3d216e02a9218e9acad8d
-
-net: bridge - set_via_phys_dev_state should return int value
-
-While playing with bridge code I found the following
-compiler warning
-
-|  CC      net/bridge/br_sysfs_br.o
-|net/bridge/br_sysfs_br.c: In function ‘store_via_phys_dev_state’:
-|net/bridge/br_sysfs_br.c:199: warning: passing argument 4 of
-|‘store_bridge_parm’ from incompatible pointer type
-
-This is due to store_bridge_parm uses int returning callback.
-Fix it.
-
-Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
-Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
----
-
-diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c
-index 5b6f301..b33cf32 100644
---- a/net/bridge/br_sysfs_br.c
-+++ b/net/bridge/br_sysfs_br.c
-@@ -188,9 +188,10 @@ static ssize_t show_via_phys_dev_state(struct device *cd,
- 	return sprintf(buf, "%d\n", br->via_phys_dev);
- }
- 
--static void set_via_phys_dev_state(struct net_bridge *br, unsigned long val)
-+static int set_via_phys_dev_state(struct net_bridge *br, unsigned long val)
- {
--	br->via_phys_dev = val;
-+	br->via_phys_dev = val ? 1 : 0;
-+	return 0;
- }
- 
- static ssize_t store_via_phys_dev_state(struct device *cd,
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-check-for-no-mmaps.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-check-for-no-mmaps.patch
deleted file mode 100644
index 451489ad424e..000000000000
--- a/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-check-for-no-mmaps.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Cyrill Gorcunov <gorcunov@openvz.org>
-Date: Thu, 23 Apr 2009 09:47:54 +0000 (+0400)
-Subject: mm: check for no mmaps in exit_mmap()
-X-Git-Url: http://git.openvz.org/?p=linux-2.6.27-openvz;a=commitdiff_plain;h=acfd6c89981b9de80b96741380780ffe6c87a15d
-
-mm: check for no mmaps in exit_mmap()
-
-Backported commit dcd4a049 from the mainstream.
-
-http://bugzilla.openvz.org/show_bug.cgi?id=1230
-
-Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
-Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
----
-
-diff --git a/mm/mmap.c b/mm/mmap.c
-index 564186a..2679a9c 100644
---- a/mm/mmap.c
-+++ b/mm/mmap.c
-@@ -2133,6 +2133,9 @@ void exit_mmap(struct mm_struct *mm)
- 	arch_exit_mmap(mm);
- 	mmu_notifier_release(mm);
- 
-+	if (!vma)	/* Can happen if dup_mmap() received an OOM */
-+		return;
-+
- 	lru_add_drain();
- 	flush_cache_mm(mm);
- 	tlb = tlb_gather_mmu(mm, 1);
diff --git a/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-pi-futex-pid-check-fixup.patch b/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-pi-futex-pid-check-fixup.patch
deleted file mode 100644
index a12ec51e196d..000000000000
--- a/sys-kernel/openvz-sources/files/openvz-sources-2.6.27.2.1-pi-futex-pid-check-fixup.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Konstantin Khlebnikov <khlebnikov@openvz.org>
-Date: Wed, 3 Jun 2009 12:34:08 +0000 (+0400)
-Subject: pidns: pi-futex pid check fixup
-X-Git-Url: http://git.openvz.org/?p=linux-2.6.27-openvz;a=commitdiff_plain;h=81e645095ced04ab9bff9680f112774c396ab13f
-
-pidns: pi-futex pid check fixup
-
-fix WARN_ON condition
-
-port rh5 patch from Stanichenko Marat <mstanichenko@openvz.org>
-
-http://bugzilla.openvz.org/show_bug.cgi?id=1262
----
-
-diff --git a/kernel/futex.c b/kernel/futex.c
-index 1cc3092..d1351bb 100644
---- a/kernel/futex.c
-+++ b/kernel/futex.c
-@@ -534,7 +534,7 @@ lookup_pi_state(u32 uval, struct futex_hash_bucket *hb,
- 
- 			WARN_ON(!atomic_read(&pi_state->refcount));
- 			WARN_ON(pid && pi_state->owner &&
--				pi_state->owner->pid != pid);
-+				task_pid_vnr(pi_state->owner) != pid);
- 
- 			atomic_inc(&pi_state->refcount);
- 			*ps = pi_state;
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.066.7.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.066.7.ebuild
new file mode 100644
index 000000000000..ac1eb5c45b58
--- /dev/null
+++ b/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.066.7.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.18.028.066.7.ebuild,v 1.1 2009/11/26 19:12:49 pva Exp $
+
+inherit versionator
+
+ETYPE="sources"
+
+CKV=$(get_version_component_range 1-3)
+OKV=${OKV:-${CKV}}
+if [[ ${PR} == "r0" ]]; then
+KV_FULL=${CKV}-${PN/-*}-$(get_version_component_range 4-6)
+else
+KV_FULL=${CKV}-${PN/-*}-$(get_version_component_range 4-6)-${PR}
+fi
+OVZ_KERNEL="$(get_version_component_range 4)stab$(get_version_component_range 5)"
+OVZ_REV="$(get_version_component_range 6)"
+EXTRAVERSION=-${OVZ_KERNEL}
+KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
+
+inherit kernel-2
+detect_version
+
+KEYWORDS="~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+IUSE=""
+PATCHV="164.2.1.el5"
+DESCRIPTION="Full sources including OpenVZ patchset for the 2.6.18 kernel tree"
+HOMEPAGE="http://www.openvz.org"
+SRC_URI="${KERNEL_URI} ${ARCH_URI}
+	http://download.openvz.org/kernel/branches/rhel5-${CKV}/${OVZ_KERNEL}.${OVZ_REV}/patches/patch-${PATCHV}.${OVZ_KERNEL}.${OVZ_REV}-combined.gz"
+
+UNIPATCH_STRICTORDER=1
+UNIPATCH_LIST="${DISTDIR}/patch-${PATCHV}.${OVZ_KERNEL}.${OVZ_REV}-combined.gz
+${FILESDIR}/${PN}-2.6.18.028.064.7-bridgemac.patch"
+
+K_EXTRAEINFO="This openvz kernel uses RHEL5 patchset instead of vanilla kernel.
+This patchset considered to be more stable and security supported by upstream,
+that why they suggested us to use it. But note: RHEL5 patchset is very fragile
+and fails to build in many configurations so if you have problems use config
+files from openvz team http://wiki.openvz.org/Download/kernel/rhel5/${OVZ_KERNEL}"
+
+K_EXTRAEWARN="This kernel is stable only when built with gcc-4.1.x and is known
+to oops in random places if built with newer compilers."
diff --git a/sys-kernel/openvz-sources/openvz-sources-2.6.27.2.1-r3.ebuild b/sys-kernel/openvz-sources/openvz-sources-2.6.27.2.1-r3.ebuild
deleted file mode 100644
index 39127ea9afd7..000000000000
--- a/sys-kernel/openvz-sources/openvz-sources-2.6.27.2.1-r3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openvz-sources/openvz-sources-2.6.27.2.1-r3.ebuild,v 1.2 2009/11/04 07:57:27 pva Exp $
-
-inherit versionator
-
-# Upstream uses string to version their releases. To make portage version
-# comparisment working we have to use numbers instead of strings, that is 4th
-# component of our version. So we have aivazovsky - 1, briullov - 2 and so on.
-# Keep this string on top since we have to modify it each new release.
-OVZ_CODENAME="briullov"
-OVZ_CODENAME_SUBRELEASE=$(get_version_component_range 5)
-
-OVZ_KV="${OVZ_CODENAME}.${OVZ_CODENAME_SUBRELEASE}"
-
-ETYPE="sources"
-
-CKV=$(get_version_component_range 1-3)
-OKV=${OKV:-${CKV}}
-EXTRAVERSION=-${PN/-*}-${OVZ_KV}
-KV_FULL=${CKV}${EXTRAVERSION}
-if [[ ${PR} != r0 ]]; then
-	KV_FULL+=-${PR}
-	EXTRAVERSION+=-${PR}
-fi
-
-# ${KV_MAJOR}.${KV_MINOR}.${KV_PATCH} should succeed.
-KV_MAJOR=$(get_version_component_range 1 ${OKV})
-KV_MINOR=$(get_version_component_range 2 ${OKV})
-KV_PATCH=$(get_version_component_range 3 ${OKV})
-
-KERNEL_URI="mirror://kernel/linux/kernel/v${KV_MAJOR}.${KV_MINOR}/linux-${OKV}.tar.bz2"
-
-inherit kernel-2
-detect_version
-
-SLOT=${CKV}-${OVZ_KV}
-if [[ ${PR} != r0 ]]; then
-	SLOT+=-${PR}
-fi
-
-KEYWORDS="amd64 ~ia64 ~ppc64 ~sparc x86"
-IUSE=""
-
-DESCRIPTION="Kernel sources with OpenVZ patchset"
-HOMEPAGE="http://www.openvz.org"
-SRC_URI="${KERNEL_URI} ${ARCH_URI}
-	http://download.openvz.org/kernel/branches/${CKV}/${CKV}-${OVZ_KV}/patches/patch-${OVZ_KV}-combined.gz
-	mirror://gentoo/linux-2.6.27-openvz-2.6.27.37-merge.patch.bz2"
-
-UNIPATCH_STRICTORDER=1
-UNIPATCH_LIST="${DISTDIR}/patch-${OVZ_KV}-combined.gz
-${DISTDIR}/linux-2.6.27-openvz-2.6.27.37-merge.patch.bz2"
-
-K_EXTRAEINFO="For more information about this kernel take a look at:
-http://wiki.openvz.org/Download/kernel/${CKV}/${CKV}-${OVZ_KV}"