Removed disable-preempt from all ebuilds and the patches themselves from CVS.

(Portage version: 2.0.54)

12 files changed, 41 insertions, 88 deletions

diff --git a/media-video/nvidia-kernel/ChangeLog b/media-video/nvidia-kernel/ChangeLog
index 5a8c834797d4..8155295d8872 100644
--- a/media-video/nvidia-kernel/ChangeLog
+++ b/media-video/nvidia-kernel/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for media-video/nvidia-kernel
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.136 2006/04/08 03:45:24 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/ChangeLog,v 1.137 2006/05/02 14:14:55 augustus Exp $
+
+  02 May 2006; Kristopher Kersey <augustus@gentoo.org>
+  -files/1.0.6629/nv-disable-preempt-on-smp_processor_id.patch,
+  -files/1.0.7167/NVIDIA_kernel-1.0-7167-disable-preempt-on-smp_processor_id
+  .patch, nvidia-kernel-1.0.6629-r5.ebuild,
+  nvidia-kernel-1.0.7167-r1.ebuild, nvidia-kernel-1.0.7174-r2.ebuild,
+  nvidia-kernel-1.0.7667.ebuild, nvidia-kernel-1.0.7676-r1.ebuild,
+  nvidia-kernel-1.0.8174-r1.ebuild, nvidia-kernel-1.0.8178-r3.ebuild,
+  nvidia-kernel-1.0.8756.ebuild:
+  Removed disable-preempt from all ebuilds and the patches themselves from CVS.
+  Bug #125368.  Also made some general cleanups of the ebuilds.
 
 *nvidia-kernel-1.0.8756 (08 Apr 2006)
 
diff --git a/media-video/nvidia-kernel/Manifest b/media-video/nvidia-kernel/Manifest
index 38405cfafd0d..408588c989af 100644
--- a/media-video/nvidia-kernel/Manifest
+++ b/media-video/nvidia-kernel/Manifest
@@ -18,7 +18,6 @@ MD5 bca6ad85efa6071a949bdcb24fce1733 files/1.0.6629/NVIDIA_kernel-1.0-6629-agp_b
 MD5 0983a2cbdacbaa3ae1a9ac1759a37706 files/1.0.6629/NVIDIA_kernel-1.0-7174-1296092.diff 3663
 MD5 dbf80a2cbaf69a10521429e1b2a7e10c files/1.0.6629/conftest_koutput_includes.patch 1082
 MD5 5aef5c6a394896bbb8392816f6795147 files/1.0.6629/nv-amd64-shutup-warnings.patch 902
-MD5 c039797780f78262baa02ff488e822ff files/1.0.6629/nv-disable-preempt-on-smp_processor_id.patch 435
 MD5 ddeae194df6bb2112d7de723df8d84c2 files/1.0.6629/nv-fix-memory-limit.patch 18398
 MD5 e70739410861defb6bf3d40f2706d554 files/1.0.6629/nv-pgd_offset.patch 3139
 MD5 0009ccc8f3896f22bad06fd549639072 files/1.0.6629/nv-pgprot-speedup.patch 1518
@@ -28,7 +27,6 @@ MD5 70bb10b2da2423a6be2a4c2bce38d807 files/1.0.7167/NVIDIA_kernel-1.0-7167-12339
 MD5 e2625e9e0a6679c38783b5d8985fdaf6 files/1.0.7167/NVIDIA_kernel-1.0-7167-1237815.patch 1100
 MD5 82d99e72fddbc1b0447708afd84dc8c5 files/1.0.7167/NVIDIA_kernel-1.0-7167-amd64-shutup-warnings.patch 770
 MD5 7ae487fba8a81fb91d53f35b9066512f files/1.0.7167/NVIDIA_kernel-1.0-7167-conftest-koutput-includes.patch 1082
-MD5 9df3fbed7af6fcb4ad13b1b5c3851381 files/1.0.7167/NVIDIA_kernel-1.0-7167-disable-preempt-on-smp_processor_id.patch 419
 MD5 6c6bd7d2e4589cf3f4725082bb413a43 files/1.0.7167/NVIDIA_kernel-1.0-7167-x86-shutup-warnings.patch 742
 MD5 fea578e529e3261412ebbf622e05531a files/1.0.7174/NVIDIA_kernel-1.0-7174-1258475.diff 3971
 MD5 0983a2cbdacbaa3ae1a9ac1759a37706 files/1.0.7174/NVIDIA_kernel-1.0-7174-1296092.diff 3663
@@ -58,11 +56,11 @@ MD5 fd91b5143517828d72c387da3596a8df files/digest-nvidia-kernel-1.0.8756 164
 MD5 e8166a48172ea0f32a3b73e2d44f30a3 files/nvidia 704
 MD5 075fe48a4f1fc90d2c3814e7bcd1d1ab metadata.xml 313
 MD5 6912838fee04de491aa184c309e274a9 nvidia-kernel-1.0.6111-r3.ebuild 4523
-MD5 8aac41beeb1f441bb1dc5fe1aaabbd84 nvidia-kernel-1.0.6629-r5.ebuild 4772
-MD5 b44523732e779c46cebed035eb62cbfc nvidia-kernel-1.0.7167-r1.ebuild 3982
-MD5 ca24e01d6a1f384a349d4ed597a4c077 nvidia-kernel-1.0.7174-r2.ebuild 4277
-MD5 0da986517ab8d7beb13c5d1fe5a4c1c6 nvidia-kernel-1.0.7667.ebuild 4538
-MD5 6e28642fae4a75a66584dd04910cbac4 nvidia-kernel-1.0.7676-r1.ebuild 4669
-MD5 37df0e5dfe53647a35ffd1166d5311e8 nvidia-kernel-1.0.8174-r1.ebuild 3584
-MD5 2e142484a5623be668193eac6e097914 nvidia-kernel-1.0.8178-r3.ebuild 3585
-MD5 f0d3fd1248d77eb37489cf44b2010c54 nvidia-kernel-1.0.8756.ebuild 3540
+MD5 2308f10da18441c793930f6890489c2e nvidia-kernel-1.0.6629-r5.ebuild 4638
+MD5 1184c8ae78e072d9f380c3eb7dc385fc nvidia-kernel-1.0.7167-r1.ebuild 3850
+MD5 245860374d9e7a92d35aef03c81bbddf nvidia-kernel-1.0.7174-r2.ebuild 4134
+MD5 2989f1241567591b53a925a108a52aeb nvidia-kernel-1.0.7667.ebuild 4246
+MD5 3f6a147dc092eabb6074854e18d13b3d nvidia-kernel-1.0.7676-r1.ebuild 4377
+MD5 b515560b694117754fa319c3b44e3b97 nvidia-kernel-1.0.8174-r1.ebuild 3444
+MD5 3ab9761b5f93050a2068af2a87a05584 nvidia-kernel-1.0.8178-r3.ebuild 3445
+MD5 50d7b78db253d25e3f3ee7a9e32d02cf nvidia-kernel-1.0.8756.ebuild 3400
diff --git a/media-video/nvidia-kernel/files/1.0.6629/nv-disable-preempt-on-smp_processor_id.patch b/media-video/nvidia-kernel/files/1.0.6629/nv-disable-preempt-on-smp_processor_id.patch
deleted file mode 100644
index ea40fa14f4e3..000000000000
--- a/media-video/nvidia-kernel/files/1.0.6629/nv-disable-preempt-on-smp_processor_id.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- usr/src/nv/nv.c.orig	2004-12-27 11:38:13.298374416 +1100
-+++ usr/src/nv/nv.c	2004-12-27 11:42:48.876480176 +1100
-@@ -2814,6 +2814,7 @@
-     int cpu;
- 
-     nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-+    preempt_disable();
-     cpu = get_cpu();
- 
-     if (nvl->rm_lock_cpu == cpu)
-@@ -2829,6 +2830,7 @@
- 
-     nvl->rm_lock_cpu = smp_processor_id();
-     nvl->rm_lock_count = 1;
-+    preempt_enable();
- }
- 
- void NV_API_CALL nv_unlock_rm(
diff --git a/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-disable-preempt-on-smp_processor_id.patch b/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-disable-preempt-on-smp_processor_id.patch
deleted file mode 100644
index a8246e5516ac..000000000000
--- a/media-video/nvidia-kernel/files/1.0.7167/NVIDIA_kernel-1.0-7167-disable-preempt-on-smp_processor_id.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- nv.orig/nv.c	2004-12-27 11:38:13.298374416 +1100
-+++ nv/nv.c	2004-12-27 11:42:48.876480176 +1100
-@@ -2814,6 +2814,7 @@
-     int cpu;
- 
-     nvl = NV_GET_NVL_FROM_NV_STATE(nv);
-+    preempt_disable();
-     cpu = get_cpu();
- 
-     if (nvl->rm_lock_cpu == cpu)
-@@ -2829,6 +2830,7 @@
- 
-     nvl->rm_lock_cpu = smp_processor_id();
-     nvl->rm_lock_count = 1;
-+    preempt_enable();
- }
- 
- void NV_API_CALL nv_unlock_rm(
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r5.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r5.ebuild
index e0e6a3dbe06c..6fde87b3c9b7 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r5.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r5.ebuild,v 1.1 2006/01/10 19:59:18 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.6629-r5.ebuild,v 1.2 2006/05/02 14:14:55 augustus Exp $
 
 inherit eutils linux-mod
 
@@ -102,8 +102,6 @@ src_unpack() {
 		einfo "Applying 2.6 kernel patches"
 		# Fix the /usr/src/linux/include/asm not existing on koutput issue #58294
 		epatch ${FILESDIR}/${PV}/conftest_koutput_includes.patch
-		# Fix calling of smp_processor_id() when preempt is enabled
-		epatch ${FILESDIR}/${PV}/nv-disable-preempt-on-smp_processor_id.patch
 		# Fix a limitation on available video memory bug #71684
 		epatch ${FILESDIR}/${PV}/NVIDIA_kernel-1.0-6629-1161283.patch
 		# New multi-agp support with newer -mm kernels
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r1.ebuild
index b03af3dffe70..d22da57a2bff 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r1.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r1.ebuild,v 1.3 2005/10/28 07:19:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7167-r1.ebuild,v 1.4 2006/05/02 14:14:55 augustus Exp $
 
 inherit eutils linux-mod
 
@@ -94,8 +94,6 @@ src_unpack() {
 		einfo "Applying 2.6 kernel patches"
 		# Fix the /usr/src/linux/include/asm not existing on koutput issue #58294
 		epatch ${NV_PATCH_PREFIX}-conftest-koutput-includes.patch
-		# Fix calling of smp_processor_id() when preempt is enabled
-		epatch ${NV_PATCH_PREFIX}-disable-preempt-on-smp_processor_id.patch
 	fi
 
 	# if you set this then it's your own fault when stuff breaks :)
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.7174-r2.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7174-r2.ebuild
index 5eed263e2277..d5579daf0e78 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.7174-r2.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.7174-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7174-r2.ebuild,v 1.1 2006/01/24 15:03:35 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7174-r2.ebuild,v 1.2 2006/05/02 14:14:55 augustus Exp $
 
 inherit eutils linux-mod
 
@@ -99,8 +99,6 @@ src_unpack() {
 		einfo "Applying 2.6 kernel patches"
 		# Fix the /usr/src/linux/include/asm not existing on koutput issue #58294
 		epatch ${NV_PATCH_PREFIX//7174/7167}-conftest-koutput-includes.patch
-		# Fix calling of smp_processor_id() when preempt is enabled
-		epatch ${NV_PATCH_PREFIX//7174/7167}-disable-preempt-on-smp_processor_id.patch
 	fi
 
 	# if you set this then it's your own fault when stuff breaks :)
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild
index 585128188a64..c1fc0aa6c294 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild,v 1.3 2005/10/28 07:19:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7667.ebuild,v 1.4 2006/05/02 14:14:55 augustus Exp $
 
 inherit eutils linux-mod
 
@@ -91,10 +91,6 @@ src_unpack() {
 	# Now any patches specific to the 2.6 kernel should go here
 	if kernel_is 2 6 ; then
 		einfo "Applying 2.6 kernel patches"
-		# Fix the /usr/src/linux/include/asm not existing on koutput issue #58294
-		# epatch ${NV_PATCH_PREFIX//7174/7167}-conftest-koutput-includes.patch
-		# Fix calling of smp_processor_id() when preempt is enabled
-		epatch ${NV_PATCH_PREFIX//7667/7167}-disable-preempt-on-smp_processor_id.patch
 		epatch ${NV_PATCH_PREFIX}-KERNEL_VERSION-moved.patch
 	fi
 
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.7676-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.7676-r1.ebuild
index bf4b97dc5fd5..781594d05a96 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.7676-r1.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.7676-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7676-r1.ebuild,v 1.2 2005/10/28 07:19:45 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.7676-r1.ebuild,v 1.3 2006/05/02 14:14:55 augustus Exp $
 
 inherit eutils linux-mod
 
@@ -94,10 +94,6 @@ src_unpack() {
 	# Now any patches specific to the 2.6 kernel should go here
 	if kernel_is 2 6 ; then
 		einfo "Applying 2.6 kernel patches"
-		# Fix the /usr/src/linux/include/asm not existing on koutput issue #58294
-		# epatch ${NV_PATCH_PREFIX//7174/7167}-conftest-koutput-includes.patch
-		# Fix calling of smp_processor_id() when preempt is enabled
-		epatch ${NV_PATCH_PREFIX//7676/7167}-disable-preempt-on-smp_processor_id.patch
 		epatch ${NV_PATCH_PREFIX//7676/7667}-KERNEL_VERSION-moved.patch
 	fi
 
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.8174-r1.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.8174-r1.ebuild
index 7a30a08e67e1..8cde53dd11d8 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.8174-r1.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.8174-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.8174-r1.ebuild,v 1.1 2005/12/07 21:32:17 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.8174-r1.ebuild,v 1.2 2006/05/02 14:14:55 augustus Exp $
 
 inherit eutils linux-mod
 
@@ -83,11 +83,9 @@ src_unpack() {
 	epatch ${NV_PATCH_PREFIX}-1423627.diff
 
 	# Now any patches specific to the 2.6 kernel should go here
-	if kernel_is 2 6 ; then
-		einfo "Applying 2.6 kernel patches"
-		# Fix calling of smp_processor_id() when preempt is enabled
-		epatch ${NV_PATCH_PREFIX//8174/7167}-disable-preempt-on-smp_processor_id.patch
-	fi
+	#if kernel_is 2 6 ; then
+	#	einfo "Applying 2.6 kernel patches"
+	#fi
 
 	# Quiet down warnings the user do not need to see
 	sed -i \
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.8178-r3.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.8178-r3.ebuild
index a938a56c1547..db748c08ae6d 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.8178-r3.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.8178-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.8178-r3.ebuild,v 1.2 2006/03/24 20:20:23 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.8178-r3.ebuild,v 1.3 2006/05/02 14:14:55 augustus Exp $
 
 inherit eutils linux-mod
 
@@ -83,11 +83,9 @@ src_unpack() {
 	epatch ${NV_PATCH_PREFIX}-U012206.diff
 
 	# Now any patches specific to the 2.6 kernel should go here
-	if kernel_is 2 6 ; then
-		einfo "Applying 2.6 kernel patches"
-		# Fix calling of smp_processor_id() when preempt is enabled
-		epatch ${NV_PATCH_PREFIX//8178/7167}-disable-preempt-on-smp_processor_id.patch
-	fi
+	#if kernel_is 2 6 ; then
+	#	einfo "Applying 2.6 kernel patches"
+	#fi
 
 	# Quiet down warnings the user do not need to see
 	sed -i \
diff --git a/media-video/nvidia-kernel/nvidia-kernel-1.0.8756.ebuild b/media-video/nvidia-kernel/nvidia-kernel-1.0.8756.ebuild
index ae67c1bb717a..ca605f16a05b 100644
--- a/media-video/nvidia-kernel/nvidia-kernel-1.0.8756.ebuild
+++ b/media-video/nvidia-kernel/nvidia-kernel-1.0.8756.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.8756.ebuild,v 1.1 2006/04/08 03:45:26 augustus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/nvidia-kernel/nvidia-kernel-1.0.8756.ebuild,v 1.2 2006/05/02 14:14:55 augustus Exp $
 
 inherit eutils linux-mod
 
@@ -82,11 +82,9 @@ src_unpack() {
 	# Patches from Zander goes here
 
 	# Now any patches specific to the 2.6 kernel should go here
-	if kernel_is 2 6 ; then
-		einfo "Applying 2.6 kernel patches"
-		# Fix calling of smp_processor_id() when preempt is enabled
-		epatch ${NV_PATCH_PREFIX//8756/7167}-disable-preempt-on-smp_processor_id.patch
-	fi
+	#if kernel_is 2 6 ; then
+	#	einfo "Applying 2.6 kernel patches"
+	#fi
 
 	# Quiet down warnings the user do not need to see
 	sed -i \