Added a patch for the FPU-lockup issue; please see bug #58304 for details.

5 files changed, 26 insertions, 5 deletions

diff --git a/sys-kernel/planet-ccrma-sources/ChangeLog b/sys-kernel/planet-ccrma-sources/ChangeLog
index 48e9729f56cc..e4ee2c4dc995 100644
--- a/sys-kernel/planet-ccrma-sources/ChangeLog
+++ b/sys-kernel/planet-ccrma-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/planet-ccrma-sources
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/planet-ccrma-sources/ChangeLog,v 1.15 2004/06/02 13:52:14 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/planet-ccrma-sources/ChangeLog,v 1.16 2004/06/14 19:24:24 plasmaroo Exp $
+
+*planet-ccrma-sources-2.4.21-r9 (14 Jun 2004)
+
+  14 Jun 2004; <plasmaroo@gentoo.org> -planet-ccrma-sources-2.4.21-r8.ebuild,
+  +planet-ccrma-sources-2.4.21-r9.ebuild,
+  +files/planet-ccrma-sources.FPULockup-53804.patch:
+  Added a patch for the FPU-lockup issue; please see bug #58304 for details. Old
+  version removed.
 
 *planet-ccrma-sources-2.4.21-r8 (02 Jun 2004)
 
diff --git a/sys-kernel/planet-ccrma-sources/Manifest b/sys-kernel/planet-ccrma-sources/Manifest
index c98f178b4410..81adcc527efe 100644
--- a/sys-kernel/planet-ccrma-sources/Manifest
+++ b/sys-kernel/planet-ccrma-sources/Manifest
@@ -1,12 +1,13 @@
-MD5 935d1dbe20ac95e023ec1d664ddcef1c ChangeLog 3176
-MD5 0a86728e1fc62c1c7e50a73b0715d2aa planet-ccrma-sources-2.4.21-r8.ebuild 3904
+MD5 8b624efe6f18115d52c98db26f288613 ChangeLog 3497
+MD5 c48b7becf1c7ed665e8799831da48ab2 planet-ccrma-sources-2.4.21-r9.ebuild 3995
 MD5 fb311162d56a954e09b111a7d8d0340e metadata.xml 473
 MD5 e77a93fdf26f06cf3ea5080b27211725 files/planet-ccrma-sources.CAN-2003-0985.patch 414
 MD5 174438d215b70cad5ffb00ca8123c062 files/planet-ccrma-sources.munmap.patch 837
+MD5 c9da1bc82b906f6abc648c056e7bf662 files/planet-ccrma-sources.FPULockup-53804.patch 354
 MD5 eaeda68a619caaddd5b8fdc5e7c39932 files/planet-ccrma-sources.CAN-2004-0177.patch 384
-MD5 59f5e2bd9a32c727f02ad6469a0adc68 files/digest-planet-ccrma-sources-2.4.21-r8 164
 MD5 de75cfa969ed092578d9ddda6c5be334 files/planet-ccrma-sources.CAN-2004-0181.patch 1233
 MD5 b41e8d6c3073fd2a438a2dcf569a3b5a files/planet-ccrma-sources.rtc_fix.patch 2793
+MD5 59f5e2bd9a32c727f02ad6469a0adc68 files/digest-planet-ccrma-sources-2.4.21-r9 164
 MD5 147fec50180ad91b6260fc7201dcb90f files/planet-ccrma-sources.CAN-2004-0010.patch 6050
 MD5 ac42024b6e6ee1e2165914db4b22a61c files/planet-ccrma-sources.CAN-2004-0178.patch 424
 MD5 f19e34110f61d3b54f33c176cece8a27 files/kernel.h 473
diff --git a/sys-kernel/planet-ccrma-sources/files/digest-planet-ccrma-sources-2.4.21-r8 b/sys-kernel/planet-ccrma-sources/files/digest-planet-ccrma-sources-2.4.21-r9
index d42092c1bc83..d42092c1bc83 100644
--- a/sys-kernel/planet-ccrma-sources/files/digest-planet-ccrma-sources-2.4.21-r8
+++ b/sys-kernel/planet-ccrma-sources/files/digest-planet-ccrma-sources-2.4.21-r9
diff --git a/sys-kernel/planet-ccrma-sources/files/planet-ccrma-sources.FPULockup-53804.patch b/sys-kernel/planet-ccrma-sources/files/planet-ccrma-sources.FPULockup-53804.patch
new file mode 100644
index 000000000000..1dd5ed87b520
--- /dev/null
+++ b/sys-kernel/planet-ccrma-sources/files/planet-ccrma-sources.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/planet-ccrma-sources/planet-ccrma-sources-2.4.21-r8.ebuild b/sys-kernel/planet-ccrma-sources/planet-ccrma-sources-2.4.21-r9.ebuild
index f7422e54c870..8ec4a6ceda72 100644
--- a/sys-kernel/planet-ccrma-sources/planet-ccrma-sources-2.4.21-r8.ebuild
+++ b/sys-kernel/planet-ccrma-sources/planet-ccrma-sources-2.4.21-r9.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/planet-ccrma-sources/planet-ccrma-sources-2.4.21-r8.ebuild,v 1.1 2004/06/02 13:52:14 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/planet-ccrma-sources/planet-ccrma-sources-2.4.21-r9.ebuild,v 1.1 2004/06/14 19:24:24 plasmaroo Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -60,6 +60,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}.CAN-2004-0181.patch || die "Failed to add the CAN-2004-0181 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
 	epatch ${FILESDIR}/${PN}.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0427 patch!"
+	epatch ${FILESDIR}/${PN}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
 
 	EXTRAVERSION="$EXTRAVERSION-${PR}" kernel_universal_unpack
 }