11 files changed, 39 insertions, 61 deletions
diff --git a/sys-kernel/mm-sources/ChangeLog b/sys-kernel/mm-sources/ChangeLog
index fce37b606609..440071e61845 100644
--- a/sys-kernel/mm-sources/ChangeLog
+++ b/sys-kernel/mm-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/mm-sources
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.133 2004/03/08 23:54:42 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/ChangeLog,v 1.134 2004/03/11 20:13:37 latexer Exp $
+
+*mm-sources-2.6.4-r1 (11 Mar 2004)
+
+  11 Mar 2004; Peter Johanson <latexer@gentoo.org> mm-sources-2.6.3-r1.ebuild,
+  mm-sources-2.6.3-r2.ebuild, mm-sources-2.6.3-r3.ebuild,
+  mm-sources-2.6.4-r1.ebuild, files/2.6.4-r1-debug-spinlock-fix.diff,
+  files/2.6.4-r1-tty-fix.diff:
+  Bump, including a few small fixes from LKML. Cleaned out some older stuff too.
 
 *mm-sources-2.6.4_rc2-r1 (08 Mar 2004)
 
diff --git a/sys-kernel/mm-sources/Manifest b/sys-kernel/mm-sources/Manifest
index 0b027a4646f3..36f6d3c4a85b 100644
--- a/sys-kernel/mm-sources/Manifest
+++ b/sys-kernel/mm-sources/Manifest
@@ -1,18 +1,19 @@
+MD5 1259441353446776f4adab45d9169cce mm-sources-2.6.4-r1.ebuild 1107
 MD5 b777a4e61360ab2b552597cfa4a98eab mm-sources-2.6.3-r4.ebuild 1064
-MD5 f320606fb8be56a698af21a619256192 mm-sources-2.6.3-r1.ebuild 1161
 MD5 6a0ecc0a0adab8c227111f00de4158e6 mm-sources-2.6.4_rc1-r2.ebuild 1032
-MD5 b1e0b9975c5711c7ee4e0c931a3579f7 mm-sources-2.6.3-r3.ebuild 1070
 MD5 778d31ba9f08bc060df066524414c885 mm-sources-2.6.4_rc2-r1.ebuild 1032
 MD5 adf5e2db0fbacec783616f3f2caf0fdf mm-sources-2.6.4_rc1-r1.ebuild 1032
 MD5 72d0e5b1c4fb0494d0d13a2a8c3523fc ChangeLog 22833
 MD5 5e95fced23ea7c26d39274bc200dabd5 metadata.xml 351
-MD5 1c57bbabaac556e39f24c5402f63ba5d mm-sources-2.6.3-r2.ebuild 1028
 MD5 bd9f94e618531f7b76322e9ce9f0ba08 files/mm-sources-2.6.3-r4-symbol-fixes.diff 900
 MD5 0d45126e56d8ebc58c4a3ad5945e0857 files/digest-mm-sources-2.6.3-r1 125
 MD5 620a1b6d5c18e1d4bd141928e94b7ba5 files/digest-mm-sources-2.6.3-r2 125
 MD5 0630b49dd2987ea793674dd5c4d48e76 files/digest-mm-sources-2.6.3-r3 125
 MD5 1c6c36ce96912f9916665f209e4f5ed6 files/digest-mm-sources-2.6.3-r4 125
+MD5 8b128c333d4166be610d05c3699d5e76 files/digest-mm-sources-2.6.4-r1 124
+MD5 a613978c67d87fc251c04d2a52dddcc2 files/2.6.4-r1-tty-fix.diff 575
 MD5 4e3139ff294ab9f18b052675ccf658ea files/mm-sources-2.6.3-r3-misc-modules-fixes.diff 1596
+MD5 8f578df14b624397068e82c4f6c51232 files/2.6.4-r1-debug-spinlock-fix.diff 325
 MD5 c50d8c537acf8fa8202902729e01a4c8 files/digest-mm-sources-2.6.4_rc1-r1 193
 MD5 47a1d7c5f3d4481e6cf79f788df89330 files/digest-mm-sources-2.6.4_rc1-r2 193
 MD5 dc0c51330f8209152426eb294f5b9676 files/digest-mm-sources-2.6.4_rc2-r1 193
diff --git a/sys-kernel/mm-sources/files/2.6.4-r1-debug-spinlock-fix.diff b/sys-kernel/mm-sources/files/2.6.4-r1-debug-spinlock-fix.diff
new file mode 100644
index 000000000000..f5ca79c4b109
--- /dev/null
+++ b/sys-kernel/mm-sources/files/2.6.4-r1-debug-spinlock-fix.diff
@@ -0,0 +1,10 @@
+--- 25/fs/mpage.c~mpage-locking-bug	2004-03-11 00:29:21.000000000 -0800
++++ 25-akpm/fs/mpage.c	2004-03-11 00:29:25.000000000 -0800
+@@ -672,7 +672,6 @@ mpage_writepages(struct address_space *m
+ 		}
+ 		pagevec_release(&pvec);
+ 	}
+-	spin_unlock_irq(&mapping->tree_lock);
+ 	if (bio)
+ 		mpage_bio_submit(WRITE, bio);
+ 	return ret;
+\ No newline at end of file
diff --git a/sys-kernel/mm-sources/files/2.6.4-r1-tty-fix.diff b/sys-kernel/mm-sources/files/2.6.4-r1-tty-fix.diff
new file mode 100644
index 000000000000..d6b20b260956
--- /dev/null
+++ b/sys-kernel/mm-sources/files/2.6.4-r1-tty-fix.diff
@@ -0,0 +1,12 @@
+diff -aur linux-2.6.4-mm1-orig/fs/compat_ioctl.c linux-2.6.4-mm1/fs/compat_ioctl.c
+--- linux-2.6.4-mm1-orig/fs/compat_ioctl.c	2004-03-11 09:45:00.000000000 -0500
++++ linux-2.6.4-mm1/fs/compat_ioctl.c	2004-03-11 14:14:49.769779584 -0500
+@@ -1604,7 +1604,7 @@
+ 	 * To have permissions to do most of the vt ioctls, we either have
+ 	 * to be the owner of the tty, or super-user.
+ 	 */
+-	if (current->tty == tty || capable(CAP_SYS_ADMIN))
++	if (current->signal->tty == tty || capable(CAP_SYS_ADMIN))
+ 		return 1;
+ 	return 0;                                                    
+ }
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.3-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.3-r1
deleted file mode 100644
index 41e6b48fc494..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.3-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6063a7e424355ec52e0cb559fb99034d linux-2.6.3.tar.bz2 34271622
-MD5 c34388d38e06604fab6376e392724487 2.6.3-mm1.bz2 1028739
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.3-r2 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.3-r2
deleted file mode 100644
index 796815f61d37..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.3-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6063a7e424355ec52e0cb559fb99034d linux-2.6.3.tar.bz2 34271622
-MD5 a5a511784ff10fe136bd3ca3c983786b 2.6.3-mm2.bz2 1691264
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.3-r3 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.3-r3
deleted file mode 100644
index 80ff7e87d7ac..000000000000
--- a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.3-r3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 6063a7e424355ec52e0cb559fb99034d linux-2.6.3.tar.bz2 34271622
-MD5 e63453b5a0ea365152746336b50f7018 2.6.3-mm3.bz2 2194085
diff --git a/sys-kernel/mm-sources/files/digest-mm-sources-2.6.4-r1 b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.4-r1
new file mode 100644
index 000000000000..96c643f55990
--- /dev/null
+++ b/sys-kernel/mm-sources/files/digest-mm-sources-2.6.4-r1
@@ -0,0 +1,2 @@
+MD5 335f06eba1e5372ba38a0d2b253629bd linux-2.6.4.tar.bz2 34386912
+MD5 ec783ee70d5fe41df29db6b02d3ef417 2.6.4-mm1.bz2 882508
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.3-r1.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.3-r1.ebuild
deleted file mode 100644
index 4e137df93700..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.3-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2004 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.3-r1.ebuild,v 1.1 2004/02/18 14:36:40 latexer Exp $
-
-UNIPATCH_LIST="${DISTDIR}/${KV}.bz2"
-K_PREPATCHED="yes"
-UNIPATCH_STRICTORDER="yes"
-
-ETYPE="sources"
-inherit kernel-2
-detect_version
-K_NOSETEXTRAVERSION="don't_set_it"
-RESTRICT="nomirror"
-DESCRIPTION="Andrew Morton's kernel, mostly fixes for 2.6 vanilla, some vm stuff too"
-SRC_URI="${KERNEL_URI} mirror://kernel/linux/kernel/people/akpm/patches/2.6/${KV/-mm*/}/${KV}/${KV}.bz2"
-
-KEYWORDS="x86 ~amd64 ~ia64 -*"
-
-K_EXTRAEINFO="If there are issues with this kernel, search http://bugs.gentoo.org/ for an
-existing bug. Only create a new bug if you have not found one that matches
-your issue. It is best to do an advanced search as the initial search has a
-very low yield. Please assign your bugs to x86-kernel@gentoo.org.
-Please read the ChangeLog and associated docs for more information."
-
-K_EXTRAEWARN="NOTE: processor selection has changed. You'll need to make sure you
-select the proper cpu type during make oldconfig"
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.3-r3.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.3-r3.ebuild
deleted file mode 100644
index 6f638b8eaef4..000000000000
--- a/sys-kernel/mm-sources/mm-sources-2.6.3-r3.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2004 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.3-r3.ebuild,v 1.2 2004/02/23 16:26:59 lostlogic Exp $
-
-UNIPATCH_LIST="${DISTDIR}/${KV}.bz2 ${FILESDIR}/$PF-misc-modules-fixes.diff"
-K_PREPATCHED="yes"
-UNIPATCH_STRICTORDER="yes"
-
-ETYPE="sources"
-inherit kernel-2
-detect_version
-K_NOSETEXTRAVERSION="don't_set_it"
-RESTRICT="nomirror"
-DESCRIPTION="Andrew Morton's kernel, mostly fixes for 2.6 vanilla, some vm stuff too"
-SRC_URI="${KERNEL_URI} mirror://kernel/linux/kernel/people/akpm/patches/2.6/${KV/-mm*/}/${KV}/${KV}.bz2"
-
-KEYWORDS="x86 ~amd64 ~ia64 -*"
-
-K_EXTRAEINFO="If there are issues with this kernel, search http://bugs.gentoo.org/ for an
-existing bug. Only create a new bug if you have not found one that matches
-your issue. It is best to do an advanced search as the initial search has a
-very low yield. Please assign your bugs to x86-kernel@gentoo.org.
-Please read the ChangeLog and associated docs for more information."
diff --git a/sys-kernel/mm-sources/mm-sources-2.6.3-r2.ebuild b/sys-kernel/mm-sources/mm-sources-2.6.4-r1.ebuild
index 6ef018e54d24..a87adc255700 100644
--- a/sys-kernel/mm-sources/mm-sources-2.6.3-r2.ebuild
+++ b/sys-kernel/mm-sources/mm-sources-2.6.4-r1.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/mm-sources/mm-sources-2.6.3-r2.ebuild,v 1.1 2004/02/20 16:22:24 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/mm-sources/mm-sources-2.6.4-r1.ebuild,v 1.1 2004/03/11 20:13:37 latexer Exp $
 
-UNIPATCH_LIST="${DISTDIR}/${KV}.bz2"
+UNIPATCH_LIST="${DISTDIR}/${KV}.bz2 ${FILESDIR}/${PVR}-debug-spinlock-fix.diff ${FILESDIR}/${PVR}-tty-fix.diff"
 K_PREPATCHED="yes"
 UNIPATCH_STRICTORDER="yes"