Added patches for the FPU-lockup issues; please see bug #58304 for details.

13 files changed, 50 insertions, 25 deletions

diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index 3abb5e569046..77d45ad304cc 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/gentoo-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.70 2004/06/10 21:40:40 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.71 2004/06/14 20:37:48 plasmaroo Exp $
+
+*gentoo-sources-2.4.20-r18 (14 Jun 2004)
+
+  14 Jun 2004; <plasmaroo@gentoo.org> +gentoo-sources-2.4.19-r15.ebuild,
+  +gentoo-sources-2.4.20-r18.ebuild, +gentoo-sources-2.4.22-r11.ebuild,
+  +gentoo-sources-2.4.25-r4.ebuild, +gentoo-sources-2.4.26-r2.ebuild,
+  +files/gentoo-sources-2.4.FPULockup-53804.patch:
+  Added patches for the FPU-lockup issues; please see bug #58304 for details.
+  Old versions removed.
 
 *gentoo-sources-2.4.26-r1 (10 Jun 2004)
 
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index e32e91e7a2da..a732d56782a5 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,29 +1,28 @@
-MD5 25ce02382308342a905b25979b243895 ChangeLog 17557
-MD5 81834b4de0ca5a4bd3b4bbe8663d587b gentoo-sources-2.4.22-r10.ebuild 1445
+MD5 29580d2529520ef997ad23cbbc3a732b ChangeLog 17968
+MD5 65b42badf8c90030f78850a376d3bd23 gentoo-sources-2.4.26-r2.ebuild 626
+MD5 a353950e4843fbfd887502315504a7d8 gentoo-sources-2.4.19-r15.ebuild 3551
+MD5 3ae5a3a4d63d6d43c6f45da091d792d1 gentoo-sources-2.4.25-r4.ebuild 883
 MD5 c39e44cdffc658550831af5b93b392d5 metadata.xml 289
-MD5 4efff62e168ac9b2ea43af9d09b67a00 gentoo-sources-2.4.19-r14.ebuild 3456
-MD5 f09971236dad1fdda5f97ac5e341094e gentoo-sources-2.4.25-r3.ebuild 839
-MD5 4c0b5cc55dd5b9cdc70a39440daebe7a gentoo-sources-2.4.26-r1.ebuild 570
-MD5 81fbd664913e192a3ab3d2032f4f1a47 gentoo-sources-2.4.20-r17.ebuild 6190
-MD5 fc288f24a93773f560020bd65344ae93 files/digest-gentoo-sources-2.4.26-r1 145
+MD5 a18795e1f17cc8819279fee18f10b8d3 gentoo-sources-2.4.22-r11.ebuild 1489
+MD5 13f317eebf0fce146113a5b848600482 gentoo-sources-2.4.20-r18.ebuild 6284
 MD5 6450fd1b19f30aa33866e5e467c0d828 files/gentoo-sources-2.4.20-cs46xx-gcc33.patch 374
-MD5 8c31359a134b927f7038539e7dd896d4 files/digest-gentoo-sources-2.4.19-r14 146
 MD5 c460ea130cb4ae84a5063ba044e3ce72 files/gentoo-sources-2.4.CAN-2004-0427.patch 460
 MD5 b40c150e8529876064e1ec409a47984e files/security.patch4 783
 MD5 2f4db0083c0ed762c0af63f26812a68b files/gentoo-sources-2.4.20-fix-proc-mm.patch 1300
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/gentoo-sources-2.4.CAN-2003-0985.patch 414
-MD5 180cbe4b3ff8f173552bca65b345beaa files/digest-gentoo-sources-2.4.22-r10 147
 MD5 9601c35f96d297ed0d13753875fb3068 files/gentoo-sources-2.4.20-gcc33.patch 13455
 MD5 174438d215b70cad5ffb00ca8123c062 files/gentoo-sources-2.4.munmap.patch 837
 MD5 032ff70c5895cc1a2dfbe2a58ebde1f7 files/gentoo-sources-2.4.19-munmap.patch 819
 MD5 df40eece807d039cba79f477e80ebda2 files/gentoo-sources-2.4.19-rtc_fix.patch 4974
 MD5 ac42024b6e6ee1e2165914db4b22a61c files/gentoo-sources-2.4.CAN-2004-0178.patch 424
 MD5 21ebf0ddc4b8ec4013470c4d243cd03b files/gentoo-sources-2.4.20-munmap.patch 826
+MD5 34487f5dc39d4ce8178004ced591fa83 files/digest-gentoo-sources-2.4.20-r18 146
 MD5 7b306c2be9db38aeb8e0dbfea6dea17a files/gentoo-sources-2.4.20-hpt372.patch 31675
 MD5 d4a740ae56c2049247083af387a22a85 files/gentoo-sources-2.4.CAN-2004-0394.patch 350
+MD5 fc288f24a93773f560020bd65344ae93 files/digest-gentoo-sources-2.4.26-r2 145
 MD5 9f412f3083cdd87db058dd2f5fbcd103 files/gentoo-sources-2.4.20-ipt-realm.patch 1028
-MD5 0f54abe62bc4311334eb74604dc39e52 files/digest-gentoo-sources-2.4.25-r3 144
 MD5 d96fe98630a0a160723a67e4ca93dcff files/gentoo-sources-2.4.20-grsec-datasize_fix.patch 1421
+MD5 180cbe4b3ff8f173552bca65b345beaa files/digest-gentoo-sources-2.4.22-r11 147
 MD5 de75cfa969ed092578d9ddda6c5be334 files/gentoo-sources-2.4.CAN-2004-0181.patch 1233
 MD5 f308aef282ea75ea55d5c6035dafa100 files/security.patch2 4014
 MD5 1326d31d343f60512dfb1376bfe134a2 files/gentoo-sources-2.4.20-sched-interrupt.patch 400
@@ -31,12 +30,14 @@ MD5 39af009b63a2f2042ac251fa801044d9 files/gentoo-sources-2.4.19-CAN-2004-0181.p
 MD5 a61e57d5483a06f20da339d91f98fbb8 files/gentoo-sources-2.4.20-rtc_fix.patch 6769
 MD5 147fec50180ad91b6260fc7201dcb90f files/gentoo-sources-2.4.CAN-2004-0010.patch 6050
 MD5 6bd1b3d66aca4f2ae0cfd964caa28cc9 files/gentoo-sources-2.4.20-devfs-snd-fix.patch 1973
-MD5 34487f5dc39d4ce8178004ced591fa83 files/digest-gentoo-sources-2.4.20-r17 146
+MD5 8c31359a134b927f7038539e7dd896d4 files/digest-gentoo-sources-2.4.19-r15 146
+MD5 0f54abe62bc4311334eb74604dc39e52 files/digest-gentoo-sources-2.4.25-r4 144
 MD5 5bf9836a632a861728d33f9736bb7431 files/gentoo-sources-2.4.CAN-2004-0133.patch 427
 MD5 e2e2b545b6fcdcecf49e33798efa5b84 files/gentoo-sources-2.4.22-rtc_fix.patch 7073
 MD5 3bf2f78421fe7eb5babc154d4ad4dbbd files/security.patch1 14328
 MD5 857ff623313f874e811763a2db96e831 files/lcall-DoS.patch 885
 MD5 012e8ba5d18dbb8d508ac4955e143e3a files/gentoo-sources-2.4.20-ipt-route.patch 13307
+MD5 c9da1bc82b906f6abc648c056e7bf662 files/gentoo-sources-2.4.FPULockup-53804.patch 354
 MD5 cbd2a33f15a8d2e7ab700a0b45fac377 files/gentoo-sources-2.4.20-grsec-disabled.patch 562
 MD5 2ac4fd77e067652901ccf234c9687bb1 files/i810_drm.patch 1247
 MD5 0d1cdff97252338dc5acc37c5f84d7c6 files/security.patch3 3333
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r14 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r15
index 19d991259834..19d991259834 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r14
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.19-r15
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r17 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r18
index 0d9abd01d13b..0d9abd01d13b 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r17
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.20-r18
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r10 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r11
index a564b8210a40..a564b8210a40 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r10
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.22-r11
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r3 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r4
index b1beb984fb40..b1beb984fb40 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r3
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.25-r4
diff --git a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r1 b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r2
index 7e8d028df131..7e8d028df131 100644
--- a/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r1
+++ b/sys-kernel/gentoo-sources/files/digest-gentoo-sources-2.4.26-r2
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.FPULockup-53804.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.FPULockup-53804.patch
new file mode 100644
index 000000000000..1dd5ed87b520
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.FPULockup-53804.patch
@@ -0,0 +1,11 @@
+--- linux-2.4/include/asm-i386/i387.h	2004-06-13 20:06:05.044881328 +0100
++++ linux-2.4/include/asm-i386/i387.h	2004-06-13 20:25:42.836829736 +0100
+@@ -34,7 +34,7 @@
+ 
+ #define clear_fpu( tsk ) do { \
+ 	if ( tsk->flags & PF_USEDFPU ) { \
+-		asm volatile("fwait"); \
++		asm volatile("fnclex ; fwait"); \
+ 		tsk->flags &= ~PF_USEDFPU; \
+ 		stts(); \
+ 	} \
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r14.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r15.ebuild
index 54555e2314de..693ca7b8c937 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r14.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r14.ebuild,v 1.2 2004/06/13 17:30:03 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.19-r15.ebuild,v 1.1 2004/06/14 20:37:48 plasmaroo Exp $
 
 IUSE="build crypt xfs acpi4linux"
 
@@ -35,7 +35,7 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Linux kernel"
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://gentoo.lostlogicx.com/patches-${KV/14/10}.tar.bz2"
+	 http://gentoo.lostlogicx.com/patches-${KV/15/10}.tar.bz2"
 KEYWORDS="x86 -ppc -sparc -amd64 -ia64"
 SLOT="${KV}"
 
@@ -43,7 +43,7 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die
 
-	cd ${KV/14/10}
+	cd ${KV/15/10}
 	# Kill patches we aren't suppposed to use, don't worry about 
 	# failures, if they aren't there that is a good thing!
 
@@ -74,4 +74,5 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-CAN-2004-0181.patch || die "Failed to add the CAN-2004-0181 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0427 patch!"
+	epatch ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
 }
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r17.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r18.ebuild
index 88a3eae1432c..5195d6d1af03 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r17.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r17.ebuild,v 1.1 2004/06/01 16:45:42 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r18.ebuild,v 1.1 2004/06/14 20:37:48 plasmaroo Exp $
 
 IUSE="build crypt evms2 aavm usagi"
 
@@ -30,7 +30,7 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Kernel."
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/17/14}.tar.bz2"
+	 http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/patches-${KV/18/14}.tar.bz2"
 HOMEPAGE="http://www.gentoo.org/ http://www.kernel.org/"
 LICENSE="GPL-2"
 KEYWORDS="x86 -ppc -sparc -alpha -hppa -mips"
@@ -40,7 +40,7 @@ src_unpack() {
 	unpack ${A}
 	mv linux-${OKV} linux-${KV} || die "Error moving kernel source tree to linux-${KV}"
 
-	cd ${WORKDIR}/${KV/17/14}
+	cd ${WORKDIR}/${KV/18/14}
 
 	# This is the *ratified* aavm USE flag, enables aavm support in this kernel
 	if [ -z "`use aavm`" ]; then
@@ -135,6 +135,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0181.patch || die "Failed to add the CAN-2004-0181 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
 	epatch ${FILESDIR}/${PN}-2.4.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0427 patch!"
+	epatch ${FILESDIR}/${PN}-2.4.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
 }
 
 pkg_postinst() {
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r10.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r11.ebuild
index b4c288aa2467..7b1ac0d8fd10 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r10.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r10.ebuild,v 1.1 2004/06/01 16:45:42 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.22-r11.ebuild,v 1.1 2004/06/14 20:37:48 plasmaroo Exp $
 
 ETYPE="sources"
 UNIPATCH_LIST="
@@ -15,7 +15,8 @@ UNIPATCH_LIST="
 	${FILESDIR}/${PN}-2.4.CAN-2004-0181.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0394.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0427.patch
-	${DISTDIR}/gentoo-sources-${PVR/10/5}.patch.bz2"
+	${FILESDIR}/${PN}-2.4.FPULockup-53804.patch
+	${DISTDIR}/gentoo-sources-${PVR/11/5}.patch.bz2"
 
 inherit kernel-2
 detect_version
@@ -24,7 +25,7 @@ S=${WORKDIR}/linux-${KV}
 
 DESCRIPTION="Full sources for the Gentoo Kernel."
 SRC_URI="mirror://kernel/linux/kernel/v2.4/linux-${OKV}.tar.bz2
-	http://dev.gentoo.org/~iggy/gentoo-sources-${PVR/10/5}.patch.bz2"
+	http://dev.gentoo.org/~iggy/gentoo-sources-${PVR/11/5}.patch.bz2"
 KEYWORDS="x86 -*"
 SLOT="${KV}"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r3.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r4.ebuild
index 4c5e46f04ca5..2d3c67eea977 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r3.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r3.ebuild,v 1.1 2004/06/01 16:45:42 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.25-r4.ebuild,v 1.1 2004/06/14 20:37:48 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -15,6 +15,7 @@ UNIPATCH_LIST="
 	${FILESDIR}/${PN}-2.4.CAN-2004-0181.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0394.patch
 	${FILESDIR}/${PN}-2.4.CAN-2004-0427.patch
+	${FILESDIR}/${PN}-2.4.FPULockup-53804.patch
 	${DISTDIR}/${P}.patch.bz2"
 
 DESCRIPTION="Full sources including the gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r2.ebuild
index 9b07341ffccc..7e7e6975e04d 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r1.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r1.ebuild,v 1.1 2004/06/10 21:40:40 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.26-r2.ebuild,v 1.1 2004/06/14 20:37:48 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
 detect_version
 
 KEYWORDS="~x86"
-UNIPATCH_LIST="${DISTDIR}/${P}-${PR}.tar.bz2"
+UNIPATCH_LIST="${FILESDIR}/${PN}-2.4.FPULockup-53804.patch ${DISTDIR}/${P}-${PR/r2/r1}.tar.bz2"
 
 DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${P}-${PR}.tar.bz2"
+SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${P}-${PR/r2/r1}.tar.bz2"