summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Low <lostlogic@gentoo.org>2003-11-21 19:00:44 +0000
committerBrandon Low <lostlogic@gentoo.org>2003-11-21 19:00:44 +0000
commita4cf62f62fe2f306f06c0a1e0ffcd72e97a798fa (patch)
tree8903e2a7fad6e6f5e29966812436ba76c30ee2be /sys-kernel/mm-sources
parentnew package (diff)
downloadhistorical-a4cf62f62fe2f306f06c0a1e0ffcd72e97a798fa.tar.gz
historical-a4cf62f62fe2f306f06c0a1e0ffcd72e97a798fa.tar.bz2
historical-a4cf62f62fe2f306f06c0a1e0ffcd72e97a798fa.zip
Fix alsa crashes with a lil' patch
Diffstat (limited to 'sys-kernel/mm-sources')
-rw-r--r--sys-kernel/mm-sources/ChangeLog6
-rw-r--r--sys-kernel/mm-sources/Manifest15
-rw-r--r--sys-kernel/mm-sources/files/2.6.0-test9-mm4-alsa-crash.patch11
-rw-r--r--sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r4.ebuild3
4 files changed, 26 insertions, 9 deletions
diff --git a/sys-kernel/mm-sources/ChangeLog b/sys-kernel/mm-sources/ChangeLog
index 0f39f1a2cdd3..59832b92cec3 100644
--- a/sys-kernel/mm-sources/ChangeLog
+++ b/sys-kernel/mm-sources/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-kernel/mm-sources
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.94 2003/11/20 17:22:16 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.95 2003/11/21 19:00:41 lostlogic Exp $
+
+ 21 Nov 2003; Brandon Low <lostlogic@gentoo.org>
+ mm-sources-2.6.0_beta9-r4.ebuild, files/2.6.0-test9-mm4-alsa-crash.patch:
+ Add a patch for ALSA crashes
*mm-sources-2.6.0_beta9-r4 (20 Nov 2003)
diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index 43ad69208989..a3fe5e2dfcaa 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -1,13 +1,14 @@
-MD5 23d95f353e2477dbb1e085d6f449da33 ChangeLog 16323
-MD5 62587df4b49506468241ec3c9415b010 metadata.xml 435
-MD5 a4fa5e46323f3235eb7866a9568bc52a mm-sources-2.6.0_beta8-r1.ebuild 3010
-MD5 f4c883a89f1c1440869339a008a745cf mm-sources-2.6.0_beta9-r1.ebuild 3010
MD5 6f14f01d4ac15ea7ff95f94b66c93ae7 mm-sources-2.6.0_beta9-r2.ebuild 3010
-MD5 a69a69149879ef6b3155b6ce4bbe63a0 mm-sources-2.6.0_beta9-r4.ebuild 3006
+MD5 0ee621803e934c132718f0680a8ae907 mm-sources-2.6.0_beta9-r4.ebuild 3114
+MD5 f4c883a89f1c1440869339a008a745cf mm-sources-2.6.0_beta9-r1.ebuild 3010
+MD5 a4fa5e46323f3235eb7866a9568bc52a mm-sources-2.6.0_beta8-r1.ebuild 3010
+MD5 5b28698ddf66b4450043ae6bd109b8da ChangeLog 16485
+MD5 62587df4b49506468241ec3c9415b010 metadata.xml 435
+MD5 b3e6c57a381a41e3bdc287b0be80b603 files/2.6.0-test9-mm4-alsa-crash.patch 375
+MD5 c2a85ee37f0ce1076159ec64b7c5a78d files/wpadded.patch 1751
MD5 ed6f583c9a528322461a432cf8f0409c files/2.6.0-test5-mm4-devfsd-fix 594
MD5 4178d67824f7d4cf5e79343b1abaf9b1 files/digest-mm-sources-2.6.0_beta8-r1 136
MD5 94fc121371d523e8325787991b2fdc6e files/digest-mm-sources-2.6.0_beta9-r1 136
MD5 0d5c87030c2a839be9a8d8dbd2799e2d files/digest-mm-sources-2.6.0_beta9-r2 136
-MD5 0ac4461e6816f905cb95484cf01904fa files/test5.patch 606
-MD5 c2a85ee37f0ce1076159ec64b7c5a78d files/wpadded.patch 1751
MD5 ed137d558869c8cfabc0244e0be42a6d files/digest-mm-sources-2.6.0_beta9-r4 136
+MD5 0ac4461e6816f905cb95484cf01904fa files/test5.patch 606
diff --git a/sys-kernel/mm-sources/files/2.6.0-test9-mm4-alsa-crash.patch b/sys-kernel/mm-sources/files/2.6.0-test9-mm4-alsa-crash.patch
new file mode 100644
index 000000000000..93a16676f186
--- /dev/null
+++ b/sys-kernel/mm-sources/files/2.6.0-test9-mm4-alsa-crash.patch
@@ -0,0 +1,11 @@
+--- linux-2.6.0-test9-mm4/mm/memory.c.orig 2003-11-21 19:21:44.197223144 +0100
++++ linux-2.6.0-test9-mm4/mm/memory.c 2003-11-21 19:21:18.596115104 +0100
+@@ -1424,7 +1424,7 @@
+ pte_t entry;
+ struct pte_chain *pte_chain;
+ int sequence = 0;
+- int ret;
++ int ret = VM_FAULT_MINOR;
+
+ if (!vma->vm_ops || !vma->vm_ops->nopage)
+ return do_anonymous_page(mm, vma, page_table,
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r4.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r4.ebuild
index d0d0e2cd08a7..0090027e8553 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r4.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r4.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/mm-sources/mm-sources-2.6.0_beta9-r4.ebuild,v 1.1 2003/11/20 17:22:16 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0_beta9-r4.ebuild,v 1.2 2003/11/21 19:00:41 lostlogic Exp $
#OKV=original kernel version, KV=patched kernel version. They can be the same.
ETYPE="sources"
@@ -38,6 +38,7 @@ src_unpack() {
mv linux-${OKV} linux-${KV}
cd ${S}
bzcat ${DISTDIR}/${KV}.bz2 | patch -p1 || die "mm patch failed"
+ patch -p1 < ${FILESDIR}/${PV/_beta/-test}-${PR/r/mm}-alsa-crash.patch || die "alsa-crash patch failed"
find . -iname "*~" | xargs rm 2> /dev/null
# Gentoo Linux uses /boot, so fix 'make install' to work properly