added a patch to fix compile errors

4 files changed, 27 insertions, 4 deletions

diff --git a/sys-kernel/mm-sources/ChangeLog b/sys-kernel/mm-sources/ChangeLog
index 1e2a33f00745..aeac63265a50 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.76 2003/09/10 13:37:38 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.77 2003/09/10 14:57:59 tseng Exp $
+
+  10 Sep 2003; Brandon Hale <tseng@gentoo.org>
+  mm-sources-2.6.0_beta5-r1.ebuild, files/test5.patch:
+  Added a small patch to fix compile errors.
 
 *mm-sources-2.6.0_beta5-r1 (10 Sep 2003)
 
diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index 4a0bc5d6e5cf..675caf8e9cd0 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -1,4 +1,4 @@
-MD5 45a48ce9c4bac353f5012f4e73c08a6c ChangeLog 12743
+MD5 c0123f3258421af6095a58cf59f08f95 ChangeLog 12891
 MD5 de6f56266c94e31a0b8a4d9c4da0d9f1 mm-sources-2.6.0_beta3-r1.ebuild 2072
 MD5 b140135947ad7abf9969215cb14f61bb mm-sources-2.6.0_beta3-r2.ebuild 2101
 MD5 9eb810173fe9cef5fde58c9da6efc4cd mm-sources-2.6.0_beta3-r3.ebuild 2109
@@ -8,7 +8,7 @@ MD5 31b4471944762587c36e5bdcf2c828b8 mm-sources-2.6.0_beta4-r3.ebuild 2924
 MD5 067d3364059f1f766f1407963b4cc095 mm-sources-2.6.0_beta4-r4.ebuild 2920
 MD5 1e325327e7b60ce6c03a78769b398455 mm-sources-2.6.0_beta4-r5.ebuild 2920
 MD5 34c045a7e9f4abd2150a14dbc07845c1 mm-sources-2.6.0_beta4-r6.ebuild 2920
-MD5 369dd5a00a331a49950bab517d319f80 mm-sources-2.6.0_beta5-r1.ebuild 2918
+MD5 6d0a5f9bc52b2e6bb0c149d702b4939b mm-sources-2.6.0_beta5-r1.ebuild 2984
 MD5 7a30e716e2d27e98aaa68d5eee6c63b2 files/digest-mm-sources-2.6.0_beta3-r1 136
 MD5 c21a38ab9d0191bf6d8e29c62ed33a8f files/digest-mm-sources-2.6.0_beta3-r2 136
 MD5 9dd17030e60ec4e849afdb6d610e231d files/digest-mm-sources-2.6.0_beta3-r3 137
@@ -20,3 +20,4 @@ MD5 7c689ec53830d68311304fc8792b0f75 files/digest-mm-sources-2.6.0_beta4-r5 137
 MD5 695b3dc1243fb34b5b5f4fe24378a188 files/digest-mm-sources-2.6.0_beta4-r6 137
 MD5 c2a85ee37f0ce1076159ec64b7c5a78d files/wpadded.patch 1751
 MD5 c9cffb80faf222315de7521e6595cea3 files/digest-mm-sources-2.6.0_beta5-r1 136
+MD5 0ac4461e6816f905cb95484cf01904fa files/test5.patch 606
diff --git a/sys-kernel/mm-sources/files/test5.patch b/sys-kernel/mm-sources/files/test5.patch
new file mode 100644
index 000000000000..38bb627764c2
--- /dev/null
+++ b/sys-kernel/mm-sources/files/test5.patch
@@ -0,0 +1,16 @@
+diff -urN linux-2.6.0-test5-orig/mm/slab.c linux-2.6.0-test5/mm/slab.c
+--- linux-2.6.0-test5-orig/mm/slab.c	2003-09-10 07:31:56.000000000 -0700
++++ linux-2.6.0-test5/mm/slab.c	2003-09-10 07:37:26.000000000 -0700
+@@ -2794,11 +2794,13 @@
+ 		} else {
+ 			kernel_map_pages(virt_to_page(objp), c->objsize/PAGE_SIZE, 1);
+ 
++#if DEBUG
+ 			if (c->flags & SLAB_RED_ZONE)
+ 				printk("redzone: 0x%lx/0x%lx.\n", *dbg_redzone1(c, objp), *dbg_redzone2(c, objp));
+ 
+ 			if (c->flags & SLAB_STORE_USER)
+ 				printk("Last user: %p.\n", *dbg_userword(c, objp));
++#endif
+ 		}
+ 		spin_unlock_irqrestore(&c->spinlock, flags);
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.0_beta5-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.0_beta5-r1.ebuild
index ec615e2ecd57..a5d80d37df2c 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.0_beta5-r1.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.0_beta5-r1.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_beta5-r1.ebuild,v 1.1 2003/09/10 13:37:38 tseng Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.0_beta5-r1.ebuild,v 1.2 2003/09/10 14:57:59 tseng Exp $
 #OKV=original kernel version, KV=patched kernel version.  They can be the same.
 
 ETYPE="sources"
@@ -33,6 +33,8 @@ src_unpack() {
 	mv linux-${OKV} linux-${KV}
 	cd ${S}
 	bzcat ${DISTDIR}/${KV}.bz2 | patch -p1 || die "mm patch failed"
+	#fix fatal build errors in test5
+	epatch ${FILESDIR}/test5.patch
 
 	find . -iname "*~" | xargs rm 2> /dev/null