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

5 files changed, 45 insertions, 4 deletions

diff --git a/sys-kernel/aa-sources/ChangeLog b/sys-kernel/aa-sources/ChangeLog
index 4e8d893b6a8b..a70173efd660 100644
--- a/sys-kernel/aa-sources/ChangeLog
+++ b/sys-kernel/aa-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/aa-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/ChangeLog,v 1.39 2004/06/04 18:06:11 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/ChangeLog,v 1.40 2004/06/13 19:58:44 plasmaroo Exp $
+
+  13 Jun 2004; <plasmaroo@gentoo.org> aa-sources-2.4.23-r2.ebuild,
+  aa-sources-2.6.5-r5.ebuild, +files/aa-sources-2.4.23.FPULockup-53804.patch,
+  +files/aa-sources-2.6.5.FPULockup-53804.patch:
+  Added patches for the FPU-lockup issues; please see bug #58304 for details.
 
   04 Jun 2004; <plasmaroo@gentoo.org> -aa-sources-2.4.22-r1.ebuild,
   -aa-sources-2.4.23-r1.ebuild:
diff --git a/sys-kernel/aa-sources/aa-sources-2.4.23-r2.ebuild b/sys-kernel/aa-sources/aa-sources-2.4.23-r2.ebuild
index f810d40d6e47..cbb027072822 100644
--- a/sys-kernel/aa-sources/aa-sources-2.4.23-r2.ebuild
+++ b/sys-kernel/aa-sources/aa-sources-2.4.23-r2.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/aa-sources/aa-sources-2.4.23-r2.ebuild,v 1.7 2004/05/30 23:53:41 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/aa-sources-2.4.23-r2.ebuild,v 1.8 2004/06/13 19:58:44 plasmaroo Exp $
 
 IUSE=""
 
@@ -70,6 +70,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}.CAN-2004-0394.patch || die "Failed to add the CAN-2004-0394 patch!"
 	epatch ${FILESDIR}/${P}.CAN-2004-0427.patch || die "Failed to add the CAN-2004-0427 patch!"
 	epatch ${FILESDIR}/${P}.rtc_fix.patch || die "Failed to apply RTC patch!"
+	epatch ${FILESDIR}/${P}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!"
 	# The munmap() patch is already in aa2...
 
 	kernel_universal_unpack
diff --git a/sys-kernel/aa-sources/aa-sources-2.6.5-r5.ebuild b/sys-kernel/aa-sources/aa-sources-2.6.5-r5.ebuild
index d7f27f9c2ca2..3f0b92e9512c 100644
--- a/sys-kernel/aa-sources/aa-sources-2.6.5-r5.ebuild
+++ b/sys-kernel/aa-sources/aa-sources-2.6.5-r5.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/aa-sources-2.6.5-r5.ebuild,v 1.3 2004/05/30 23:53:41 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/aa-sources/aa-sources-2.6.5-r5.ebuild,v 1.4 2004/06/13 19:58:44 plasmaroo Exp $
 
-UNIPATCH_LIST="${DISTDIR}/${KV}.bz2 ${FILESDIR}/${P}.CAN-2004-0075.patch ${FILESDIR}/${P}.CAN-2004-0228.patch ${FILESDIR}/${P}.CAN-2004-0229.patch ${FILESDIR}/${P}.CAN-2004-0427.patch"
+UNIPATCH_LIST="${DISTDIR}/${KV}.bz2 ${FILESDIR}/${P}.CAN-2004-0075.patch ${FILESDIR}/${P}.CAN-2004-0228.patch ${FILESDIR}/${P}.CAN-2004-0229.patch ${FILESDIR}/${P}.CAN-2004-0427.patch ${FILESDIR}/${P}.FPULockup-53804.patch"
 K_PREPATCHED="yes"
 UNIPATCH_STRICTORDER="yes"
 
diff --git a/sys-kernel/aa-sources/files/aa-sources-2.4.23.FPULockup-53804.patch b/sys-kernel/aa-sources/files/aa-sources-2.4.23.FPULockup-53804.patch
new file mode 100644
index 000000000000..1dd5ed87b520
--- /dev/null
+++ b/sys-kernel/aa-sources/files/aa-sources-2.4.23.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/aa-sources/files/aa-sources-2.6.5.FPULockup-53804.patch b/sys-kernel/aa-sources/files/aa-sources-2.6.5.FPULockup-53804.patch
new file mode 100644
index 000000000000..a813f48ec23b
--- /dev/null
+++ b/sys-kernel/aa-sources/files/aa-sources-2.6.5.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();						\
+ 	}							\