summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Yamin <plasmaroo@gentoo.org>2003-09-24 19:32:00 +0000
committerTim Yamin <plasmaroo@gentoo.org>2003-09-24 19:32:00 +0000
commit619819a583cf2abf8972bdb12a95feaddd795061 (patch)
tree9ae81ebfa62aea4874a70feb0cbb4c6aef711dd5 /sys-kernel
parentia64 unmask (diff)
downloadgentoo-2-619819a583cf2abf8972bdb12a95feaddd795061.tar.gz
gentoo-2-619819a583cf2abf8972bdb12a95feaddd795061.tar.bz2
gentoo-2-619819a583cf2abf8972bdb12a95feaddd795061.zip
Added scheduler fix which should solve some PCMCIA issues...
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/gentoo-sources/ChangeLog6
-rw-r--r--sys-kernel/gentoo-sources/Manifest5
-rw-r--r--sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-sched-interrupt.patch16
-rw-r--r--sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild3
4 files changed, 26 insertions, 4 deletions
diff --git a/sys-kernel/gentoo-sources/ChangeLog b/sys-kernel/gentoo-sources/ChangeLog
index 79a483c00aa0..75f9390bc2ea 100644
--- a/sys-kernel/gentoo-sources/ChangeLog
+++ b/sys-kernel/gentoo-sources/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-kernel/gentoo-sources
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.31 2003/09/21 12:06:47 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.32 2003/09/24 19:31:53 plasmaroo Exp $
+
+ 24 Sep 2003; <plasmaroo@gentoo.org> gentoo-sources-2.4.20-r7.ebuild,
+ files/gentoo-sources-2.4.20-sched-interrupt.patch:
+ Added scheduler fix which should solve some PCMCIA issues.
21 Sep 2003; <plasmaroo@gentoo.org> files/gentoo-sources-2.4.20-gcc33.patch:
Added ip_nat_core.c GCC3.3 fix [Bug 28561 et al.]
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index a87ec12c2b5c..d732a41be218 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,12 +1,13 @@
-MD5 37a32714c5940cc99ce8079921f0ae5c ChangeLog 9394
+MD5 7680f81cb7b9b071b5a3d20c837d108c ChangeLog 9580
MD5 d5979ff24ef45e712ff68e48cf7c66c0 gentoo-sources-2.4.19-r10.ebuild 2113
-MD5 8dd57188ddd554f256c83c4ad058a0f6 gentoo-sources-2.4.20-r7.ebuild 4817
+MD5 4f84f296d78f4df4052b613bef37c92f gentoo-sources-2.4.20-r7.ebuild 4881
MD5 4a2e7892431d591f82bb474d737cb4eb gentoo-sources-2.4.20-r5.ebuild 4571
MD5 a6f7282c48e8a34145a255bc5cb8bbd1 gentoo-sources-2.4.20-r6.ebuild 4725
MD5 b40c150e8529876064e1ec409a47984e files/security.patch4 783
MD5 9601c35f96d297ed0d13753875fb3068 files/gentoo-sources-2.4.20-gcc33.patch 13455
MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r6 145
MD5 f308aef282ea75ea55d5c6035dafa100 files/security.patch2 4014
+MD5 1326d31d343f60512dfb1376bfe134a2 files/gentoo-sources-2.4.20-sched-interrupt.patch 400
MD5 849223b7d8e6c9c2a22f84b571aa516c files/digest-gentoo-sources-2.4.20-r7 145
MD5 3bf2f78421fe7eb5babc154d4ad4dbbd files/security.patch1 14328
MD5 857ff623313f874e811763a2db96e831 files/lcall-DoS.patch 885
diff --git a/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-sched-interrupt.patch b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-sched-interrupt.patch
new file mode 100644
index 000000000000..30a45e1840d2
--- /dev/null
+++ b/sys-kernel/gentoo-sources/files/gentoo-sources-2.4.20-sched-interrupt.patch
@@ -0,0 +1,16 @@
+--- linux-2.4.20-gentoo-r6/kernel/sched.c 2003-09-10 23:36:03.000000000 +0100
++++ linux-2.4.20-gentoo-r7/kernel/sched.c 2003-09-24 20:00:09.000000000 +0100
+@@ -1138,8 +1138,11 @@
+ list_t *queue;
+ int idx;
+ if (unlikely(in_interrupt()))
+- BUG();
+-
++ {
++ printk(KERN_ERR "Scheduling in an interrupt: killing scheduler\n");
++ dump_stack();
++ return;
++ }
+
+ need_resched:
+ preempt_disable();
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild
index aeac2a13ae56..20dd6d2d124a 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild,v 1.2 2003/09/14 12:05:25 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.20-r7.ebuild,v 1.3 2003/09/24 19:31:53 plasmaroo Exp $
IUSE="build crypt evms2 aavm usagi"
@@ -117,6 +117,7 @@ src_unpack() {
epatch ${FILESDIR}/security.patch4
epatch ${FILESDIR}/gentoo-sources-2.4.20-gcc33.patch
epatch ${FILESDIR}/gentoo-sources-2.4.20-grsec-disabled.patch
+ epatch ${FILESDIR}/gentoo-sources-2.4.20-sched-interrupt.patch
}