version bump

9 files changed, 16 insertions, 422 deletions

diff --git a/sys-kernel/ac-sources/ChangeLog b/sys-kernel/ac-sources/ChangeLog
index 980dae0c96bd..b85cbc7ec26c 100644
--- a/sys-kernel/ac-sources/ChangeLog
+++ b/sys-kernel/ac-sources/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-kernel/ac-sources
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ac-sources/ChangeLog,v 1.50 2005/01/08 12:57:23 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ac-sources/ChangeLog,v 1.51 2005/01/18 03:14:16 marineam Exp $
+
+*ac-sources-2.6.10-r10 (18 Jan 2005)
+
+  18 Jan 2005; Michael Marineau <marineam@gentoo.org>
+  files/ac-sources-2.6.10.77094.patch,
+  -files/ac-sources-2.6.10.brk-locked.patch, +ac-sources-2.6.10-r10.ebuild,
+  -ac-sources-2.6.10-r7.ebuild, -ac-sources-2.6.9-r16.ebuild:
+  Bump to ac10, closing #78245
 
 *ac-sources-2.6.10-r7 (08 Jan 2005)
 
diff --git a/sys-kernel/ac-sources/Manifest b/sys-kernel/ac-sources/Manifest
index c4ee29d908b3..967827c840f2 100644
--- a/sys-kernel/ac-sources/Manifest
+++ b/sys-kernel/ac-sources/Manifest
@@ -1,10 +1,6 @@
-MD5 c67970aeb91bc0085b18b127e38ef841 ChangeLog 3347
+MD5 565e998fc263691e68b6334060c2cade ac-sources-2.6.10-r10.ebuild 1109
+MD5 1bc8ab2e0f2ee890b3fd4bc0f026f935 ChangeLog 3648
 MD5 2b0cfdcefc398952a818684668e808f1 metadata.xml 384
-MD5 b2900ef65ee74df83641a1e0dcc0d04d ac-sources-2.6.9-r16.ebuild 1069
-MD5 689b00a9aacf37fc3cd1823748ca7b62 ac-sources-2.6.10-r7.ebuild 1144
-MD5 2c667e2fa7172f460e6e9c2699acded2 files/2.6.9-ac1-fix-extraversion.patch 1288
-MD5 98dc2cdd5a9c277afe4732183f144d6b files/ac-sources-2.6.10.77094.patch 5074
-MD5 cd0a7533c43364e377348613c6d76bb7 files/ac-sources-2.6.10.brk-locked.patch 9736
-MD5 cc9defa9a150cb44f0a42b4ca29b569a files/digest-ac-sources-2.6.9-r16 131
-MD5 0f05a322e5157eacd940a3f0dfb402cf files/digest-ac-sources-2.6.10-r7 132
 MD5 655251f31f0bdc85bdd0cd0280af22b7 files/ac-sources-2.6.10.75963.patch 979
+MD5 f662901886b741aeecf94ee29800a219 files/digest-ac-sources-2.6.10-r10 133
+MD5 1642828ee921eeb793b21733b50acdb7 files/ac-sources-2.6.10.77094.patch 3711
diff --git a/sys-kernel/ac-sources/ac-sources-2.6.10-r7.ebuild b/sys-kernel/ac-sources/ac-sources-2.6.10-r10.ebuild
index 8be5222b4320..fc09a2ae395c 100644
--- a/sys-kernel/ac-sources/ac-sources-2.6.10-r7.ebuild
+++ b/sys-kernel/ac-sources/ac-sources-2.6.10-r10.ebuild
@@ -1,12 +1,11 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ac-sources/ac-sources-2.6.10-r7.ebuild,v 1.1 2005/01/08 12:57:23 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ac-sources/ac-sources-2.6.10-r10.ebuild,v 1.1 2005/01/18 03:14:16 marineam Exp $
 
 UNIPATCH_LIST="
 	${DISTDIR}/patch-${KV}.bz2
 	${FILESDIR}/${P}.75963.patch
-	${FILESDIR}/${P}.77094.patch
-	${FILESDIR}/${P}.brk-locked.patch"
+	${FILESDIR}/${P}.77094.patch"
 K_PREPATCHED="yes"
 UNIPATCH_STRICTORDER="yes"
 
diff --git a/sys-kernel/ac-sources/ac-sources-2.6.9-r16.ebuild b/sys-kernel/ac-sources/ac-sources-2.6.9-r16.ebuild
deleted file mode 100644
index bc20ef362840..000000000000
--- a/sys-kernel/ac-sources/ac-sources-2.6.9-r16.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ac-sources/ac-sources-2.6.9-r16.ebuild,v 1.2 2005/01/07 19:02:42 dsd Exp $
-
-UNIPATCH_LIST="${DISTDIR}/patch-${KV}.bz2
-	${FILESDIR}/${P}.vma.patch"
-K_PREPATCHED="yes"
-UNIPATCH_STRICTORDER="yes"
-
-ETYPE="sources"
-inherit kernel-2
-detect_version
-K_NOSETEXTRAVERSION="don't_set_it"
-RESTRICT="nomirror"
-DESCRIPTION="Alan Cox's kernel, mostly stuff destined for mailine or RedHat's vendor kernel"
-SRC_URI="${KERNEL_URI} mirror://kernel/linux/kernel/people/alan/linux-2.6/${KV/-ac*/}/patch-${KV}.bz2"
-
-KEYWORDS="~x86 ~amd64 ~ia64 -* ~ppc"
-IUSE=""
-
-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/ac-sources/files/2.6.9-ac1-fix-extraversion.patch b/sys-kernel/ac-sources/files/2.6.9-ac1-fix-extraversion.patch
deleted file mode 100644
index f7fc8804e7f8..000000000000
--- a/sys-kernel/ac-sources/files/2.6.9-ac1-fix-extraversion.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-<--  snip  -->
-
-$ make
-  CHK     include/linux/version.h
-expr: non-numeric argument
-make[1]: `arch/i386/kernel/asm-offsets.s' is up to date.
-  CHK     include/linux/compile.h
-  CC      kernel/power/swsusp.o
-kernel/power/swsusp.c: In function `init_header':
-kernel/power/swsusp.c:327: parse error before `;'
-kernel/power/swsusp.c: In function `sanity_check':
-kernel/power/swsusp.c:1074: parse error before `)'
-make[2]: *** [kernel/power/swsusp.o] Error 1
-make[1]: *** [kernel/power] Error 2
-make: *** [kernel] Error 2
-$ cat 
-include/linux/version.h 
-#define UTS_RELEASE "2.6.9-ac1"
-#define LINUX_VERSION_CODE
-#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-$ 
-
-<--  snip  -->
-
-
-Proposed fix:
-
-
-Signed-off-by: Adrian Bunk <bunk@stusta.de>
-
---- linux-2.6.9-ac1-full/Makefile.old	2004-10-21 14:48:07.000000000 +0200
-+++ linux-2.6.9-ac1-full/Makefile	2004-10-21 14:48:30.000000000 +0200
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 6
--SUBLEVEL = 9-ac1
--EXTRAVERSION =
-+SUBLEVEL = 9
-+EXTRAVERSION = -ac1
- NAME=AC 1
- 
- # *DOCUMENTATION*
-
--
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo@vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at  http://www.tux.org/lkml/
diff --git a/sys-kernel/ac-sources/files/ac-sources-2.6.10.77094.patch b/sys-kernel/ac-sources/files/ac-sources-2.6.10.77094.patch
index ff7123d43482..fe414143aa4b 100644
--- a/sys-kernel/ac-sources/files/ac-sources-2.6.10.77094.patch
+++ b/sys-kernel/ac-sources/files/ac-sources-2.6.10.77094.patch
@@ -96,24 +96,6 @@ diff -urNp linux-2.6.10/mm/page-writeback.c linux-2.6.10-new/mm/page-writeback.c
 diff -urNp linux-2.6.10/mm/vmscan.c linux-2.6.10-new/mm/vmscan.c
 --- linux-2.6.10/mm/vmscan.c	2005-01-07 10:51:24 -0500
 +++ linux-2.6.10-new/mm/vmscan.c	2005-01-07 10:51:33 -0500
-@@ -369,14 +369,14 @@ static int shrink_list(struct list_head 
- 
- 		BUG_ON(PageActive(page));
- 
--		if (PageWriteback(page))
--			goto keep_locked;
--
- 		sc->nr_scanned++;
- 		/* Double the slab pressure for mapped and swapcache pages */
- 		if (page_mapped(page) || PageSwapCache(page))
- 			sc->nr_scanned++;
- 
-+		if (PageWriteback(page))
-+			goto keep_locked;
-+
- 		referenced = page_referenced(page, 1, sc->priority <= 0);
- 		/* In active use or really unfreeable?  Activate it. */
- 		if (referenced && page_mapping_inuse(page))
 @@ -825,6 +825,8 @@ shrink_zone(struct zone *zone, struct sc
  				break;
  		}
@@ -123,16 +105,3 @@ diff -urNp linux-2.6.10/mm/vmscan.c linux-2.6.10-new/mm/vmscan.c
  }
  
  /*
-diff -urNp linux-2.6.10/net/ipv4/netfilter/ip_conntrack_proto_tcp.c linux-2.6.10-new/net/ipv4/netfilter/ip_conntrack_proto_tcp.c
---- linux-2.6.10/net/ipv4/netfilter/ip_conntrack_proto_tcp.c	2005-01-07 10:51:24 -0500
-+++ linux-2.6.10-new/net/ipv4/netfilter/ip_conntrack_proto_tcp.c	2005-01-07 10:51:33 -0500
-@@ -906,7 +906,8 @@ static int tcp_packet(struct ip_conntrac
- 		if (index == TCP_RST_SET
- 		    && ((test_bit(IPS_SEEN_REPLY_BIT, &conntrack->status)
- 		         && conntrack->proto.tcp.last_index <= TCP_SYNACK_SET)
--		        || conntrack->proto.tcp.last_index == TCP_ACK_SET)
-+		        || (!test_bit(IPS_ASSURED_BIT, &conntrack->status)
-+			 && conntrack->proto.tcp.last_index == TCP_ACK_SET))
- 		    && after(ntohl(th->ack_seq),
- 		    	     conntrack->proto.tcp.last_seq)) {
- 			/* Ignore RST closing down invalid SYN or ACK
diff --git a/sys-kernel/ac-sources/files/ac-sources-2.6.10.brk-locked.patch b/sys-kernel/ac-sources/files/ac-sources-2.6.10.brk-locked.patch
deleted file mode 100644
index 6095e844d5f1..000000000000
--- a/sys-kernel/ac-sources/files/ac-sources-2.6.10.brk-locked.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-diff -ur linux-2.6.10/arch/mips/kernel/irixelf.c linux-2.6.10.plasmaroo/arch/mips/kernel/irixelf.c
---- linux-2.6.10/arch/mips/kernel/irixelf.c	2004-12-24 21:35:50.000000000 +0000
-+++ linux-2.6.10.plasmaroo/arch/mips/kernel/irixelf.c	2005-01-07 15:36:00.383356800 +0000
-@@ -127,7 +127,7 @@
- 	end = PAGE_ALIGN(end);
- 	if (end <= start)
- 		return;
--	do_brk(start, end - start);
-+	do_brk_locked(start, end - start);
- }
- 
- 
-@@ -375,7 +375,7 @@
- 
- 	/* Map the last of the bss segment */
- 	if (last_bss > len) {
--		do_brk(len, (last_bss - len));
-+		do_brk_locked(len, (last_bss - len));
- 	}
- 	kfree(elf_phdata);
- 
-@@ -562,7 +562,7 @@
- 	unsigned long v;
- 	struct prda *pp;
- 
--	v =  do_brk (PRDA_ADDRESS, PAGE_SIZE);
-+	v =  do_brk_locked (PRDA_ADDRESS, PAGE_SIZE);
- 
- 	if (v < 0)
- 		return;
-@@ -853,7 +853,7 @@
- 	len = (elf_phdata->p_filesz + elf_phdata->p_vaddr+ 0xfff) & 0xfffff000;
- 	bss = elf_phdata->p_memsz + elf_phdata->p_vaddr;
- 	if (bss > len)
--	  do_brk(len, bss-len);
-+	  do_brk_locked(len, bss-len);
- 	kfree(elf_phdata);
- 	return 0;
- }
-diff -ur linux-2.6.10/arch/sparc64/kernel/binfmt_aout32.c linux-2.6.10.plasmaroo/arch/sparc64/kernel/binfmt_aout32.c
---- linux-2.6.10/arch/sparc64/kernel/binfmt_aout32.c	2004-12-24 21:34:45.000000000 +0000
-+++ linux-2.6.10.plasmaroo/arch/sparc64/kernel/binfmt_aout32.c	2005-01-07 15:36:00.432349352 +0000
-@@ -49,7 +49,7 @@
- 	end = PAGE_ALIGN(end);
- 	if (end <= start)
- 		return;
--	do_brk(start, end - start);
-+	do_brk_locked(start, end - start);
- }
- 
- /*
-@@ -246,10 +246,10 @@
- 	if (N_MAGIC(ex) == NMAGIC) {
- 		loff_t pos = fd_offset;
- 		/* Fuck me plenty... */
--		error = do_brk(N_TXTADDR(ex), ex.a_text);
-+		error = do_brk_locked(N_TXTADDR(ex), ex.a_text);
- 		bprm->file->f_op->read(bprm->file, (char __user *)N_TXTADDR(ex),
- 			  ex.a_text, &pos);
--		error = do_brk(N_DATADDR(ex), ex.a_data);
-+		error = do_brk_locked(N_DATADDR(ex), ex.a_data);
- 		bprm->file->f_op->read(bprm->file, (char __user *)N_DATADDR(ex),
- 			  ex.a_data, &pos);
- 		goto beyond_if;
-@@ -257,7 +257,7 @@
- 
- 	if (N_MAGIC(ex) == OMAGIC) {
- 		loff_t pos = fd_offset;
--		do_brk(N_TXTADDR(ex) & PAGE_MASK,
-+		do_brk_locked(N_TXTADDR(ex) & PAGE_MASK,
- 			ex.a_text+ex.a_data + PAGE_SIZE - 1);
- 		bprm->file->f_op->read(bprm->file, (char __user *)N_TXTADDR(ex),
- 			  ex.a_text+ex.a_data, &pos);
-@@ -272,7 +272,7 @@
- 
- 		if (!bprm->file->f_op->mmap) {
- 			loff_t pos = fd_offset;
--			do_brk(0, ex.a_text+ex.a_data);
-+			do_brk_locked(0, ex.a_text+ex.a_data);
- 			bprm->file->f_op->read(bprm->file,
- 				  (char __user *)N_TXTADDR(ex),
- 				  ex.a_text+ex.a_data, &pos);
-@@ -389,7 +389,7 @@
- 	len = PAGE_ALIGN(ex.a_text + ex.a_data);
- 	bss = ex.a_text + ex.a_data + ex.a_bss;
- 	if (bss > len) {
--		error = do_brk(start_addr + len, bss - len);
-+		error = do_brk_locked(start_addr + len, bss - len);
- 		retval = error;
- 		if (error != start_addr + len)
- 			goto out;
-diff -Nur linux-2.6.10/arch/x86_64/ia32/ia32_aout.c linux-2.6.10.plasmaroo/arch/x86_64/ia32/ia32_aout.c
---- linux-2.6.10/arch/x86_64/ia32/ia32_aout.c	2005-01-03 16:17:04.000000000 -0200
-+++ linux-2.6.10.plasmaroo/arch/x86_64/ia32/ia32_aout.c	2005-01-03 16:46:53.846823360 -0200
-@@ -115,7 +115,7 @@
- 	end = PAGE_ALIGN(end);
- 	if (end <= start)
- 		return;
--	do_brk(start, end - start);
-+	do_brk_locked(start, end - start);
- }
- 
- #if CORE_DUMP
-@@ -325,7 +325,7 @@
- 		pos = 32;
- 		map_size = ex.a_text+ex.a_data;
- 
--		error = do_brk(text_addr & PAGE_MASK, map_size);
-+		error = do_brk_locked(text_addr & PAGE_MASK, map_size);
- 		if (error != (text_addr & PAGE_MASK)) {
- 			send_sig(SIGKILL, current, 0);
- 			return error;
-@@ -361,7 +361,7 @@
- 
- 		if (!bprm->file->f_op->mmap||((fd_offset & ~PAGE_MASK) != 0)) {
- 			loff_t pos = fd_offset;
--			do_brk(N_TXTADDR(ex), ex.a_text+ex.a_data);
-+			do_brk_locked(N_TXTADDR(ex), ex.a_text+ex.a_data);
- 			bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex),
- 					ex.a_text+ex.a_data, &pos);
- 			flush_icache_range((unsigned long) N_TXTADDR(ex),
-@@ -470,7 +470,7 @@
- 		}
- #endif
- 
--		do_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss);
-+		do_brk_locked(start_addr, ex.a_text + ex.a_data + ex.a_bss);
- 		
- 		file->f_op->read(file, (char *)start_addr,
- 			ex.a_text + ex.a_data, &pos);
-@@ -494,7 +494,7 @@
- 	len = PAGE_ALIGN(ex.a_text + ex.a_data);
- 	bss = ex.a_text + ex.a_data + ex.a_bss;
- 	if (bss > len) {
--		error = do_brk(start_addr + len, bss - len);
-+		error = do_brk_locked(start_addr + len, bss - len);
- 		retval = error;
- 		if (error != start_addr + len)
- 			goto out;
-diff -ur linux-2.6.10/fs/binfmt_aout.c linux-2.6.10.plasmaroo/fs/binfmt_aout.c
---- linux-2.6.10/fs/binfmt_aout.c	2004-12-24 21:35:50.000000000 +0000
-+++ linux-2.6.10.plasmaroo/fs/binfmt_aout.c	2005-01-07 15:36:00.000000000 +0000
-@@ -50,7 +50,7 @@
- 	start = PAGE_ALIGN(start);
- 	end = PAGE_ALIGN(end);
- 	if (end > start) {
--		unsigned long addr = do_brk(start, end - start);
-+		unsigned long addr = do_brk_locked(start, end - start);
- 		if (BAD_ADDR(addr))
- 			return addr;
- 	}
-@@ -323,10 +323,10 @@
- 		loff_t pos = fd_offset;
- 		/* Fuck me plenty... */
- 		/* <AOL></AOL> */
--		error = do_brk(N_TXTADDR(ex), ex.a_text);
-+		error = do_brk_locked(N_TXTADDR(ex), ex.a_text);
- 		bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex),
- 			  ex.a_text, &pos);
--		error = do_brk(N_DATADDR(ex), ex.a_data);
-+		error = do_brk_locked(N_DATADDR(ex), ex.a_data);
- 		bprm->file->f_op->read(bprm->file, (char *) N_DATADDR(ex),
- 			  ex.a_data, &pos);
- 		goto beyond_if;
-@@ -347,7 +347,7 @@
- 		map_size = ex.a_text+ex.a_data;
- #endif
- 
--		error = do_brk(text_addr & PAGE_MASK, map_size);
-+		error = do_brk_locked(text_addr & PAGE_MASK, map_size);
- 		if (error != (text_addr & PAGE_MASK)) {
- 			send_sig(SIGKILL, current, 0);
- 			return error;
-@@ -382,7 +382,7 @@
- 
- 		if (!bprm->file->f_op->mmap||((fd_offset & ~PAGE_MASK) != 0)) {
- 			loff_t pos = fd_offset;
--			do_brk(N_TXTADDR(ex), ex.a_text+ex.a_data);
-+			do_brk_locked(N_TXTADDR(ex), ex.a_text+ex.a_data);
- 			bprm->file->f_op->read(bprm->file,
- 					(char __user *)N_TXTADDR(ex),
- 					ex.a_text+ex.a_data, &pos);
-@@ -488,7 +488,7 @@
- 			error_time = jiffies;
- 		}
- 
--		do_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss);
-+		do_brk_locked(start_addr, ex.a_text + ex.a_data + ex.a_bss);
- 		
- 		file->f_op->read(file, (char __user *)start_addr,
- 			ex.a_text + ex.a_data, &pos);
-@@ -512,7 +512,7 @@
- 	len = PAGE_ALIGN(ex.a_text + ex.a_data);
- 	bss = ex.a_text + ex.a_data + ex.a_bss;
- 	if (bss > len) {
--		error = do_brk(start_addr + len, bss - len);
-+		error = do_brk_locked(start_addr + len, bss - len);
- 		retval = error;
- 		if (error != start_addr + len)
- 			goto out;
-diff -ur linux-2.6.10/fs/binfmt_elf.c linux-2.6.10.plasmaroo/fs/binfmt_elf.c
---- linux-2.6.10/fs/binfmt_elf.c	2004-12-24 21:34:33.000000000 +0000
-+++ linux-2.6.10.plasmaroo/fs/binfmt_elf.c	2005-01-07 15:36:00.000000000 +0000
-@@ -88,7 +88,7 @@
- 	start = ELF_PAGEALIGN(start);
- 	end = ELF_PAGEALIGN(end);
- 	if (end > start) {
--		unsigned long addr = do_brk(start, end - start);
-+		unsigned long addr = do_brk_locked(start, end - start);
- 		if (BAD_ADDR(addr))
- 			return addr;
- 	}
-@@ -408,7 +408,7 @@
- 
- 	/* Map the last of the bss segment */
- 	if (last_bss > elf_bss) {
--		error = do_brk(elf_bss, last_bss - elf_bss);
-+		error = do_brk_locked(elf_bss, last_bss - elf_bss);
- 		if (BAD_ADDR(error))
- 			goto out_close;
- 	}
-@@ -448,7 +448,7 @@
- 		goto out;
- 	}
- 
--	do_brk(0, text_data);
-+	do_brk_locked(0, text_data);
- 	if (!interpreter->f_op || !interpreter->f_op->read)
- 		goto out;
- 	if (interpreter->f_op->read(interpreter, addr, text_data, &offset) < 0)
-@@ -456,7 +456,7 @@
- 	flush_icache_range((unsigned long)addr,
- 	                   (unsigned long)addr + text_data);
- 
--	do_brk(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1),
-+	do_brk_locked(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1),
- 		interp_ex->a_bss);
- 	elf_entry = interp_ex->a_entry;
- 
-@@ -1025,7 +1025,7 @@
- 	len = ELF_PAGESTART(elf_phdata->p_filesz + elf_phdata->p_vaddr + ELF_MIN_ALIGN - 1);
- 	bss = elf_phdata->p_memsz + elf_phdata->p_vaddr;
- 	if (bss > len)
--		do_brk(len, bss - len);
-+		do_brk_locked(len, bss - len);
- 	error = 0;
- 
- out_free_ph:
-diff -ur linux-2.6.10/include/linux/mm.h linux-2.6.10.plasmaroo/include/linux/mm.h
---- linux-2.6.10/include/linux/mm.h	2004-12-24 21:33:50.000000000 +0000
-+++ linux-2.6.10.plasmaroo/include/linux/mm.h	2005-01-07 15:36:00.000000000 +0000
-@@ -704,6 +704,7 @@
- extern int do_munmap(struct mm_struct *, unsigned long, size_t);
- 
- extern unsigned long do_brk(unsigned long, unsigned long);
-+extern unsigned long do_brk_locked(unsigned long, unsigned long);
- 
- /* filemap.c */
- extern unsigned long page_unuse(struct page *);
-diff -ur linux-2.6.10/mm/mmap.c linux-2.6.10.plasmaroo/mm/mmap.c
---- linux-2.6.10/mm/mmap.c	2004-12-24 21:35:00.000000000 +0000
-+++ linux-2.6.10.plasmaroo/mm/mmap.c	2005-01-07 15:36:04.000000000 +0000
-@@ -1826,6 +1826,20 @@
- 
- EXPORT_SYMBOL(do_brk);
- 
-+/* locking version of do_brk. */
-+unsigned long do_brk_locked(unsigned long addr, unsigned long len)
-+{
-+	unsigned long ret;
-+
-+	down_write(&current->mm->mmap_sem);
-+	ret = do_brk(addr, len);
-+	up_write(&current->mm->mmap_sem);
-+
-+	return ret;
-+}
-+
-+EXPORT_SYMBOL(do_brk_locked);
-+
- /* Release all mmaps. */
- void exit_mmap(struct mm_struct *mm)
- {
-@@ -1952,3 +1966,4 @@
- 	}
- 	return new_vma;
- }
-+
-diff -ur linux-2.6.10/mm/nommu.c linux-2.6.10.plasmaroo/mm/nommu.c
---- linux-2.6.10/mm/nommu.c	2004-12-24 21:35:25.000000000 +0000
-+++ linux-2.6.10.plasmaroo/mm/nommu.c	2005-01-07 15:30:24.000000000 +0000
-@@ -557,6 +557,11 @@
- 	return -ENOMEM;
- }
- 
-+unsigned long do_brk_locked(unsigned long addr, unsigned long len)
-+{
-+	return -ENOMEM;
-+}
-+
- struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr)
- {
- 	return NULL;
diff --git a/sys-kernel/ac-sources/files/digest-ac-sources-2.6.10-r7 b/sys-kernel/ac-sources/files/digest-ac-sources-2.6.10-r10
index a1e7b52a6122..e61005a8966c 100644
--- a/sys-kernel/ac-sources/files/digest-ac-sources-2.6.10-r7
+++ b/sys-kernel/ac-sources/files/digest-ac-sources-2.6.10-r10
@@ -1,2 +1,2 @@
 MD5 cffcd2919d9c8ef793ce1ac07a440eda linux-2.6.10.tar.bz2 36533484
-MD5 d42a9214278535a859a4fab21237b269 patch-2.6.10-ac7.bz2 141249
+MD5 9fad84d3b4c2c8962c6d87f8fa2c0e0e patch-2.6.10-ac10.bz2 148400
diff --git a/sys-kernel/ac-sources/files/digest-ac-sources-2.6.9-r16 b/sys-kernel/ac-sources/files/digest-ac-sources-2.6.9-r16
deleted file mode 100644
index 4741e533d655..000000000000
--- a/sys-kernel/ac-sources/files/digest-ac-sources-2.6.9-r16
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 e921200f074ca97184e150ef5a4af825 linux-2.6.9.tar.bz2 36261440
-MD5 b46cb5c49530b48db92a1cfa77e4f38a patch-2.6.9-ac16.bz2 133276