fixup the do_brk patch, it was not applying correctly

3 files changed, 24 insertions, 20 deletions

diff --git a/sys-kernel/openmosix-sources/ChangeLog b/sys-kernel/openmosix-sources/ChangeLog
index fcbf8c177bc4..06ec614b7c2f 100644
--- a/sys-kernel/openmosix-sources/ChangeLog
+++ b/sys-kernel/openmosix-sources/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-kernel/openmosix-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.28 2003/12/02 12:04:16 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/openmosix-sources/ChangeLog,v 1.29 2003/12/02 18:18:53 iggy Exp $
+
+  02 Dec 2003; Brian Jackson <iggy@gentoo.org> files/do_brk_fix.patch:
+  fixup the do_brk patch, it wasn't applying correctly
 
 *openmosix-sources-2.4.22-r2 (02 Dec 2003)
 
diff --git a/sys-kernel/openmosix-sources/Manifest b/sys-kernel/openmosix-sources/Manifest
index f7bf829d11ee..e11d51a579ee 100644
--- a/sys-kernel/openmosix-sources/Manifest
+++ b/sys-kernel/openmosix-sources/Manifest
@@ -1,13 +1,13 @@
 MD5 5de707573772ebd655af578010d11ab8 openmosix-sources-2.4.20-r6.ebuild 3254
-MD5 249fc41c404cdf5a1d7de7742a6ea215 openmosix-sources-2.4.21.ebuild 3254
-MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
 MD5 296cb3ca0e178a603136cad6f7283b8a openmosix-sources-2.4.22-r2.ebuild 1338
-MD5 57bc52623054b93727b11ff6b6bd633d ChangeLog 2473
-MD5 dc4c95c986f736c8574459500618e31a openmosix-sources-2.4.22-r1.ebuild 1336
 MD5 22f47b2bec6b172bff9b7b9fdc628f35 openmosix-sources-2.4.22.ebuild 1333
-MD5 e637c6fa41097ea2c4693d0766f2e1c5 files/do_brk_fix.patch 242
-MD5 63a6ea904c1d7403848d3df76fa35632 files/digest-openmosix-sources-2.4.22 134
-MD5 f5cf28ccf74eccc21f96d399b429420b files/digest-openmosix-sources-2.4.21 134
-MD5 efe1d77bc50e3b37a4dcc0154edd1862 files/digest-openmosix-sources-2.4.22-r2 134
+MD5 dc4c95c986f736c8574459500618e31a openmosix-sources-2.4.22-r1.ebuild 1336
+MD5 249fc41c404cdf5a1d7de7742a6ea215 openmosix-sources-2.4.21.ebuild 3254
+MD5 c871c9dc5a8ce92d30c684400e5da993 ChangeLog 2597
+MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
 MD5 8ea0ebaf9ea87558abecdc1df6145dc5 files/digest-openmosix-sources-2.4.20-r6 133
 MD5 63a6ea904c1d7403848d3df76fa35632 files/digest-openmosix-sources-2.4.22-r1 134
+MD5 efe1d77bc50e3b37a4dcc0154edd1862 files/digest-openmosix-sources-2.4.22-r2 134
+MD5 b86824eda82b7145748fffb251dc62d4 files/do_brk_fix.patch 472
+MD5 f5cf28ccf74eccc21f96d399b429420b files/digest-openmosix-sources-2.4.21 134
+MD5 63a6ea904c1d7403848d3df76fa35632 files/digest-openmosix-sources-2.4.22 134
diff --git a/sys-kernel/openmosix-sources/files/do_brk_fix.patch b/sys-kernel/openmosix-sources/files/do_brk_fix.patch
index fef1f1e981e2..4d187c4a74b5 100644
--- a/sys-kernel/openmosix-sources/files/do_brk_fix.patch
+++ b/sys-kernel/openmosix-sources/files/do_brk_fix.patch
@@ -1,12 +1,13 @@
---- a/mm/mmap.c Fri Sep 12 06:44:06 2003
-+++ b/mm/mmap.c Thu Oct  2 01:18:19 2003
-@@ -1041,6 +1041,9 @@
-	if (!len)
-		return addr;
+diff -ru linux-2.4.22-openmosix-r1/mm/mmap.c linux-2.4.22-openmosix-r1.fixed/mm/mmap.c
+--- linux-2.4.22-openmosix-r1/mm/mmap.c	2003-12-02 11:45:58.000000000 -0600
++++ linux-2.4.22-openmosix-r1.fixed/mm/mmap.c	2003-12-02 11:53:34.868028290 -0600
+@@ -1391,6 +1391,9 @@
+ 	if (!len)
+ 		return addr;
  
-+ 	if ((addr + len) > TASK_SIZE || (addr + len) < addr)
-+ 		return -EINVAL;
-+ 
-	/*
-	 * mlock MCL_FUTURE?
-	 */
++	if ((addr + len) > TASK_SIZE || (addr + len) < addr)
++		return -EINVAL;
++
+ #ifdef CONFIG_MOSIX
+ 	if(current->mosix.dflags & DDEPUTY)
+ 		return(mosix_deputy_brk(addr, len));