diff options
Diffstat (limited to 'sys-kernel/ck-sources')
| -rw-r--r-- | sys-kernel/ck-sources/ChangeLog | 7 | ||||
| -rw-r--r-- | sys-kernel/ck-sources/Manifest | 18 | ||||
| -rw-r--r-- | sys-kernel/ck-sources/ck-sources-2.4.26-r1.ebuild | 3 | ||||
| -rw-r--r-- | sys-kernel/ck-sources/ck-sources-2.6.4-r2.ebuild | 4 | ||||
| -rw-r--r-- | sys-kernel/ck-sources/files/ck-sources-2.4.26.FPULockup-53804.patch | 11 | ||||
| -rw-r--r-- | sys-kernel/ck-sources/files/ck-sources-2.6.4.FPULockup-53804.patch | 24 |
6 files changed, 55 insertions, 12 deletions
diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog index f6e8103833af..52b88535a9aa 100644 --- a/sys-kernel/ck-sources/ChangeLog +++ b/sys-kernel/ck-sources/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-kernel/ck-sources # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.35 2004/05/30 23:53:41 pvdabeel Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.36 2004/06/13 20:22:57 plasmaroo Exp $ + + 13 Jun 2004; <plasmaroo@gentoo.org> ck-sources-2.4.26-r1.ebuild, + ck-sources-2.6.4-r2.ebuild, +files/ck-sources-2.4.26.FPULockup-53804.patch, + +files/ck-sources-2.6.5.FPULockup-53804.patch: + Added patches for the FPU-lockup issues; please see bug #58304 for details. 31 May 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> ck-sources-2.6.4-r2.ebuild: diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest index 4daef73529db..0f1c66338f68 100644 --- a/sys-kernel/ck-sources/Manifest +++ b/sys-kernel/ck-sources/Manifest @@ -1,13 +1,15 @@ -MD5 ba4238d19874d9eab108b48e602f8494 ChangeLog 6137 -MD5 e8af2b85e1a4a48195c6fe155bacd98f ck-sources-2.4.26-r1.ebuild 2228 -MD5 dcf84f3a85b367402fa48024368874e9 ck-sources-2.6.4-r2.ebuild 1306 +MD5 6985c06f88fbc3d3e8a9d570d175c633 ChangeLog 6410 +MD5 8282a5721cd7c41e5ba8b0e9c53f483b ck-sources-2.4.26-r1.ebuild 2317 +MD5 ed2672362087326ac1e65f4a955f0b70 ck-sources-2.6.4-r2.ebuild 1345 MD5 7187b8c28501f454a2412c9e4a7fcf53 metadata.xml 421 +MD5 1dd59d14a720c0c23e47e28d0b4fd6f9 files/ck-sources-2.6.4.CAN-2004-0228.patch 437 MD5 d4a740ae56c2049247083af387a22a85 files/ck-sources-2.4.26.CAN-2004-0394.patch 350 -MD5 6f4bba5dda7a99d77b1564f5489fef6e files/ck-sources-2.6.4.CAN-2004-0075.patch 1129 MD5 31ec7b4310dd7be3e34aab0204f9b1e8 files/ck-sources-2.6.4.CAN-2004-0109.patch 2072 -MD5 c8b7be9ee0da1415fa0274da5859aa62 files/ck-sources-2.6.4.CAN-2004-0181.patch 1366 -MD5 1dd59d14a720c0c23e47e28d0b4fd6f9 files/ck-sources-2.6.4.CAN-2004-0228.patch 437 -MD5 a92712e41465c49670ef7a54c2d16040 files/ck-sources-2.6.4.CAN-2004-0229.patch 471 +MD5 6232446aa42d775145bcfb735b2cfcda files/digest-ck-sources-2.6.4-r2 130 +MD5 c9da1bc82b906f6abc648c056e7bf662 files/ck-sources-2.4.26.FPULockup-53804.patch 354 +MD5 6f4bba5dda7a99d77b1564f5489fef6e files/ck-sources-2.6.4.CAN-2004-0075.patch 1129 MD5 5674421c7e2c7e50e2509bed7d96c4d4 files/ck-sources-2.6.4.CAN-2004-0427.patch 332 +MD5 a92712e41465c49670ef7a54c2d16040 files/ck-sources-2.6.4.CAN-2004-0229.patch 471 +MD5 02c062ec3a11a6a1498cdf0b1716c90a files/ck-sources-2.6.4.FPULockup-53804.patch 895 MD5 c3a6ea8105853e11fecdbfa0d6edcb04 files/digest-ck-sources-2.4.26-r1 133 -MD5 6232446aa42d775145bcfb735b2cfcda files/digest-ck-sources-2.6.4-r2 130 +MD5 c8b7be9ee0da1415fa0274da5859aa62 files/ck-sources-2.6.4.CAN-2004-0181.patch 1366 diff --git a/sys-kernel/ck-sources/ck-sources-2.4.26-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.4.26-r1.ebuild index 78532d5dd2d9..83cdeaee5fd1 100644 --- a/sys-kernel/ck-sources/ck-sources-2.4.26-r1.ebuild +++ b/sys-kernel/ck-sources/ck-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/ck-sources/ck-sources-2.4.26-r1.ebuild,v 1.1 2004/05/28 22:20:39 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.4.26-r1.ebuild,v 1.2 2004/06/13 20:22:57 plasmaroo Exp $ IUSE="" @@ -59,5 +59,6 @@ src_unpack() { bzcat ${DISTDIR}/patch-${KV}.bz2|patch -p1 || die "-lck patch failed!" 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/ck-sources/ck-sources-2.6.4-r2.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.4-r2.ebuild index 07b218286b4b..2ada4d50a840 100644 --- a/sys-kernel/ck-sources/ck-sources-2.6.4-r2.ebuild +++ b/sys-kernel/ck-sources/ck-sources-2.6.4-r2.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/ck-sources/ck-sources-2.6.4-r2.ebuild,v 1.5 2004/05/30 23:53:41 pvdabeel Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.4-r2.ebuild,v 1.6 2004/06/13 20:22:57 plasmaroo Exp $ -UNIPATCH_LIST="${DISTDIR}/patch-${KV}.bz2 ${FILESDIR}/${P}.CAN-2004-0075.patch ${FILESDIR}/${P}.CAN-2004-0109.patch ${FILESDIR}/${P}.CAN-2004-0181.patch ${FILESDIR}/${P}.CAN-2004-0228.patch ${FILESDIR}/${P}.CAN-2004-0229.patch ${FILESDIR}/${P}.CAN-2004-0427.patch" +UNIPATCH_LIST="${DISTDIR}/patch-${KV}.bz2 ${FILESDIR}/${P}.CAN-2004-0075.patch ${FILESDIR}/${P}.CAN-2004-0109.patch ${FILESDIR}/${P}.CAN-2004-0181.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/ck-sources/files/ck-sources-2.4.26.FPULockup-53804.patch b/sys-kernel/ck-sources/files/ck-sources-2.4.26.FPULockup-53804.patch new file mode 100644 index 000000000000..1dd5ed87b520 --- /dev/null +++ b/sys-kernel/ck-sources/files/ck-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/ck-sources/files/ck-sources-2.6.4.FPULockup-53804.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.4.FPULockup-53804.patch new file mode 100644 index 000000000000..a813f48ec23b --- /dev/null +++ b/sys-kernel/ck-sources/files/ck-sources-2.6.4.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(); \ + } \ |