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

7 files changed, 52 insertions, 6 deletions

diff --git a/sys-kernel/win4lin-sources/ChangeLog b/sys-kernel/win4lin-sources/ChangeLog
index 8cef3eedee33..9ae889621600 100644
--- a/sys-kernel/win4lin-sources/ChangeLog
+++ b/sys-kernel/win4lin-sources/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-kernel/win4lin-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.23 2004/06/01 17:47:24 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/ChangeLog,v 1.24 2004/06/15 18:36:02 plasmaroo Exp $
+
+*win4lin-sources-2.4.26-r1 (15 Jun 2004)
+
+  15 Jun 2004; <plasmaroo@gentoo.org> +win4lin-sources-2.4.26-r1.ebuild,
+  -win4lin-sources-2.4.26.ebuild, +win4lin-sources-2.6.6-r1.ebuild,
+  -win4lin-sources-2.6.6.ebuild,
+  +files/win4lin-sources-2.4.26.FPULockup-53804.patch,
+  +files/win4lin-sources-2.6.6.FPULockup-53804.patch:
+  Added patches for the FPU-lockup issues; please see bug #58304 for details.
 
 *win4lin-sources-2.4.26 (01 Jun 2004)
 
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26-r1
index dcbdbe419bbc..dcbdbe419bbc 100644
--- a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26
+++ b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.4.26-r1
diff --git a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.6 b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.6-r1
index 837b6e3ee5e7..837b6e3ee5e7 100644
--- a/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.6
+++ b/sys-kernel/win4lin-sources/files/digest-win4lin-sources-2.6.6-r1
diff --git a/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.26.FPULockup-53804.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.26.FPULockup-53804.patch
new file mode 100644
index 000000000000..1dd5ed87b520
--- /dev/null
+++ b/sys-kernel/win4lin-sources/files/win4lin-sources-2.4.26.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/win4lin-sources/files/win4lin-sources-2.6.6.FPULockup-53804.patch b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.6.FPULockup-53804.patch
new file mode 100644
index 000000000000..a813f48ec23b
--- /dev/null
+++ b/sys-kernel/win4lin-sources/files/win4lin-sources-2.6.6.FPULockup-53804.patch
@@ -0,0 +1,24 @@
+diff -Nru a/include/asm-i386/i387.h b/include/asm-i386/i387.h
+--- a/include/asm-i386/i387.h	2004-05-06 12:26:10 -07:00
++++ b/include/asm-i386/i387.h	2004-06-12 19:12:23 -07:00
+@@ -51,7 +51,7 @@
+ #define __clear_fpu( tsk )					\
+ do {								\
+ 	if ((tsk)->thread_info->status & TS_USEDFPU) {		\
+-		asm volatile("fwait");				\
++		asm volatile("fnclex ; fwait");			\
+ 		(tsk)->thread_info->status &= ~TS_USEDFPU;	\
+ 		stts();						\
+ 	}							\
+diff -Nru a/include/asm-x86_64/i387.h b/include/asm-x86_64/i387.h
+--- a/include/asm-x86_64/i387.h	2004-06-13 20:43:56.742530792 +0100
++++ a/include/asm-x86_64/i387.h	2004-06-13 20:42:59.200278544 +0100
+@@ -46,7 +46,7 @@
+ 
+ #define clear_fpu(tsk) do { \
+ 	if ((tsk)->thread_info->status & TS_USEDFPU) {		\
+-		asm volatile("fwait");				\
++		asm volatile("fnclex; fwait");			\
+ 		(tsk)->thread_info->status &= ~TS_USEDFPU;	\
+ 		stts();						\
+ 	}							\
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.4.26.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r1.ebuild
index 0b6e80eea5b8..0ce4b9a16055 100644
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.4.26.ebuild
+++ b/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r1.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/win4lin-sources/win4lin-sources-2.4.26.ebuild,v 1.1 2004/06/01 17:47:24 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.4.26-r1.ebuild,v 1.1 2004/06/15 18:36:02 plasmaroo Exp $
 
 # OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
@@ -8,8 +8,8 @@ IUSE=""
 ETYPE="sources"
 inherit kernel eutils
 OKV="2.4.26"
-KV="2.4.26-win4lin"
-EXTRAVERSION="-win4lin"
+EXTRAVERSION="-win4lin-${PR}"
+KV="2.4.26${EXTRAVERSION}"
 
 S=${WORKDIR}/linux-${KV}
 
@@ -31,6 +31,7 @@ src_unpack() {
 	patch -Np1 -i ${DISTDIR}/mki-adapter.patch >/dev/null 2>&1 || die "Error: mki-adapter patch failed."
 	eend $?
 	epatch ${FILESDIR}/${P}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
+	epatch ${FILESDIR}/${P}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
 
 	kernel_universal_unpack
 }
diff --git a/sys-kernel/win4lin-sources/win4lin-sources-2.6.6.ebuild b/sys-kernel/win4lin-sources/win4lin-sources-2.6.6-r1.ebuild
index 0a2b14dc89a9..d575cfb50669 100644
--- a/sys-kernel/win4lin-sources/win4lin-sources-2.6.6.ebuild
+++ b/sys-kernel/win4lin-sources/win4lin-sources-2.6.6-r1.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/win4lin-sources/win4lin-sources-2.6.6.ebuild,v 1.1 2004/06/01 17:47:24 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/win4lin-sources/win4lin-sources-2.6.6-r1.ebuild,v 1.1 2004/06/15 18:36:02 plasmaroo Exp $
 
 ETYPE="sources"
 inherit kernel-2
@@ -9,7 +9,8 @@ detect_version
 MKI_VERSION='1_3_5'
 UNIPATCH_LIST="
 	${DISTDIR}/mki-adapter26_${MKI_VERSION}.patch
-	${DISTDIR}/Kernel-Win4Lin3-${OKV}.patch"
+	${DISTDIR}/Kernel-Win4Lin3-${OKV}.patch
+	${FILESDIR}/${P}.FPULockup-53804.patch"
 
 S=${WORKDIR}/linux-${KV}