diff options
Diffstat (limited to 'sys-kernel/uclinux-sources')
| -rw-r--r-- | sys-kernel/uclinux-sources/ChangeLog | 13 | ||||
| -rw-r--r-- | sys-kernel/uclinux-sources/Manifest | 13 | ||||
| -rw-r--r-- | sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0-r1 (renamed from sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0) | 0 | ||||
| -rw-r--r-- | sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.6_p0-r1 (renamed from sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.6_p0) | 0 | ||||
| -rw-r--r-- | sys-kernel/uclinux-sources/files/uclinux-sources-2.4.26_p0.FPULockup-53804.patch | 11 | ||||
| -rw-r--r-- | sys-kernel/uclinux-sources/files/uclinux-sources-2.6.5_p0.CAN-2004-0109.patch | 88 | ||||
| -rw-r--r-- | sys-kernel/uclinux-sources/files/uclinux-sources-2.6.6_p0.FPULockup-53804.patch | 24 | ||||
| -rw-r--r-- | sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-r1.ebuild (renamed from sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0.ebuild) | 3 | ||||
| -rw-r--r-- | sys-kernel/uclinux-sources/uclinux-sources-2.6.6_p0-r1.ebuild (renamed from sys-kernel/uclinux-sources/uclinux-sources-2.6.6_p0.ebuild) | 4 |
9 files changed, 59 insertions, 97 deletions
diff --git a/sys-kernel/uclinux-sources/ChangeLog b/sys-kernel/uclinux-sources/ChangeLog index feb98de7ee8a..33e22a33bdfc 100644 --- a/sys-kernel/uclinux-sources/ChangeLog +++ b/sys-kernel/uclinux-sources/ChangeLog @@ -1,6 +1,17 @@ # ChangeLog for sys-kernel/uclinux-sources # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.8 2004/06/02 14:22:00 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/ChangeLog,v 1.9 2004/06/15 16:54:18 plasmaroo Exp $ + +*uclinux-sources-2.4.26_p0-r1 (15 Jun 2004) + + 15 Jun 2004; <plasmaroo@gentoo.org> +uclinux-sources-2.4.26_p0-r1.ebuild, + -uclinux-sources-2.4.26_p0.ebuild, +uclinux-sources-2.6.6_p0-r1.ebuild, + -uclinux-sources-2.6.6_p0.ebuild, + +files/uclinux-sources-2.4.26_p0.FPULockup-53804.patch, + -files/uclinux-sources-2.6.5_p0.CAN-2004-0109.patch, + +files/uclinux-sources-2.6.6_p0.FPULockup-53804.patch: + Added patches for the FPU-lockup issues; please see bug #58304 for details. + Old versions removed. *uclinux-sources-2.6.6_p0 (02 Jun 2004) diff --git a/sys-kernel/uclinux-sources/Manifest b/sys-kernel/uclinux-sources/Manifest index 3ba92e9621f3..4dff118fec24 100644 --- a/sys-kernel/uclinux-sources/Manifest +++ b/sys-kernel/uclinux-sources/Manifest @@ -1,8 +1,9 @@ -MD5 a563ac2970c8d469298ceb38565f2d1d ChangeLog 2255 -MD5 cb047e1fff71fc697793a673a2e55b5f uclinux-sources-2.4.26_p0.ebuild 1360 +MD5 849b68f6dbec46680ecbaf1ca356abfb ChangeLog 2759 +MD5 ff03ee40b49ee4e9f57b05a65396a1e4 uclinux-sources-2.6.6_p0-r1.ebuild 1357 MD5 f3fa6c474b8727f8215534b7fc9c93ba metadata.xml 304 -MD5 52994d9c02d91124ebb42a01982128b3 uclinux-sources-2.6.6_p0.ebuild 1263 -MD5 31ec7b4310dd7be3e34aab0204f9b1e8 files/uclinux-sources-2.6.5_p0.CAN-2004-0109.patch 2072 +MD5 7afe99fbdf3a547bd5ee8c47821d96b1 uclinux-sources-2.4.26_p0-r1.ebuild 1453 MD5 d4a740ae56c2049247083af387a22a85 files/uclinux-sources-2.4.26_p0.CAN-2004-0394.patch 350 -MD5 888a07115033bc74061391d7c4ccfaaf files/digest-uclinux-sources-2.6.6_p0 135 -MD5 62306f42a51f255b1d9cd1597cefa926 files/digest-uclinux-sources-2.4.26_p0 139 +MD5 888a07115033bc74061391d7c4ccfaaf files/digest-uclinux-sources-2.6.6_p0-r1 135 +MD5 62306f42a51f255b1d9cd1597cefa926 files/digest-uclinux-sources-2.4.26_p0-r1 139 +MD5 c9da1bc82b906f6abc648c056e7bf662 files/uclinux-sources-2.4.26_p0.FPULockup-53804.patch 354 +MD5 02c062ec3a11a6a1498cdf0b1716c90a files/uclinux-sources-2.6.6_p0.FPULockup-53804.patch 895 diff --git a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0 b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0-r1 index 130b229c980e..130b229c980e 100644 --- a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0 +++ b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.4.26_p0-r1 diff --git a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.6_p0 b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.6_p0-r1 index 19f5d1d1ba26..19f5d1d1ba26 100644 --- a/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.6_p0 +++ b/sys-kernel/uclinux-sources/files/digest-uclinux-sources-2.6.6_p0-r1 diff --git a/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.26_p0.FPULockup-53804.patch b/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.26_p0.FPULockup-53804.patch new file mode 100644 index 000000000000..1dd5ed87b520 --- /dev/null +++ b/sys-kernel/uclinux-sources/files/uclinux-sources-2.4.26_p0.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/uclinux-sources/files/uclinux-sources-2.6.5_p0.CAN-2004-0109.patch b/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.5_p0.CAN-2004-0109.patch deleted file mode 100644 index d7726c2e5aaf..000000000000 --- a/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.5_p0.CAN-2004-0109.patch +++ /dev/null @@ -1,88 +0,0 @@ ---- linux/fs/isofs/rock.c.orig -+++ linux/fs/isofs/rock.c -@@ -14,6 +14,7 @@ - #include <linux/slab.h> - #include <linux/pagemap.h> - #include <linux/smp_lock.h> - #include <linux/buffer_head.h> -+#include <asm/page.h> - - #include "rock.h" -@@ -419,7 +420,7 @@ int parse_rock_ridge_inode_internal(stru - return 0; - } - --static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr) -+static char *get_symlink_chunk(char *rpnt, struct rock_ridge *rr, char *plimit) - { - int slen; - int rootflag; -@@ -431,16 +432,25 @@ static char *get_symlink_chunk(char *rpn - rootflag = 0; - switch (slp->flags & ~1) { - case 0: -+ if (slp->len > plimit - rpnt) -+ return NULL; - memcpy(rpnt, slp->text, slp->len); - rpnt+=slp->len; - break; -+ case 2: -+ if (rpnt >= plimit) -+ return NULL; -+ *rpnt++='.'; -+ break; - case 4: -+ if (2 > plimit - rpnt) -+ return NULL; - *rpnt++='.'; -- /* fallthru */ -- case 2: - *rpnt++='.'; - break; - case 8: -+ if (rpnt >= plimit) -+ return NULL; - rootflag = 1; - *rpnt++='/'; - break; -@@ -457,17 +467,23 @@ static char *get_symlink_chunk(char *rpn - * If there is another SL record, and this component - * record isn't continued, then add a slash. - */ -- if ((!rootflag) && (rr->u.SL.flags & 1) && !(oldslp->flags & 1)) -+ if ((!rootflag) && (rr->u.SL.flags & 1) && -+ !(oldslp->flags & 1)) { -+ if (rpnt >= plimit) -+ return NULL; - *rpnt++='/'; -+ } - break; - } - - /* - * If this component record isn't continued, then append a '/'. - */ -- if (!rootflag && !(oldslp->flags & 1)) -+ if (!rootflag && !(oldslp->flags & 1)) { -+ if (rpnt >= plimit) -+ return NULL; - *rpnt++='/'; -- -+ } - } - return rpnt; - } -@@ -548,7 +564,10 @@ static int rock_ridge_symlink_readpage(s - CHECK_SP(goto out); - break; - case SIG('S', 'L'): -- rpnt = get_symlink_chunk(rpnt, rr); -+ rpnt = get_symlink_chunk(rpnt, rr, -+ link + (PAGE_SIZE - 1)); -+ if (rpnt == NULL) -+ goto out; - break; - case SIG('C', 'E'): - /* This tells is if there is a continuation record */ - - diff --git a/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.6_p0.FPULockup-53804.patch b/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.6_p0.FPULockup-53804.patch new file mode 100644 index 000000000000..a813f48ec23b --- /dev/null +++ b/sys-kernel/uclinux-sources/files/uclinux-sources-2.6.6_p0.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/uclinux-sources/uclinux-sources-2.4.26_p0.ebuild b/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-r1.ebuild index 23d9fe6dfe9e..eef9cdc573df 100644 --- a/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0.ebuild +++ b/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-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/uclinux-sources/uclinux-sources-2.4.26_p0.ebuild,v 1.1 2004/06/02 14:22:00 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/uclinux-sources-2.4.26_p0-r1.ebuild,v 1.1 2004/06/15 16:54:18 plasmaroo Exp $ IUSE="" @@ -45,6 +45,7 @@ src_unpack() { rm ../${MY_P/linux/${base}}.${patch} 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 set ARCH=${MY_ARCH} diff --git a/sys-kernel/uclinux-sources/uclinux-sources-2.6.6_p0.ebuild b/sys-kernel/uclinux-sources/uclinux-sources-2.6.6_p0-r1.ebuild index 5e971f7a9dc4..8c74b2edb36a 100644 --- a/sys-kernel/uclinux-sources/uclinux-sources-2.6.6_p0.ebuild +++ b/sys-kernel/uclinux-sources/uclinux-sources-2.6.6_p0-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/uclinux-sources/uclinux-sources-2.6.6_p0.ebuild,v 1.1 2004/06/02 14:22:00 plasmaroo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/uclinux-sources/uclinux-sources-2.6.6_p0-r1.ebuild,v 1.1 2004/06/15 16:54:18 plasmaroo Exp $ IUSE="" @@ -44,6 +44,8 @@ src_unpack() { unset ARCH rm ../${MY_P/linux/${base}}.${patch} + epatch ${FILESDIR}/${P}.FPULockup-53804.patch || die "Failed to apply FPU-lockup patch!" + kernel_universal_unpack set ARCH=${MY_ARCH} } |