version bump

(Portage version: 2.0.51-r15)

5 files changed, 93 insertions, 16 deletions

diff --git a/sys-kernel/ck-sources/ChangeLog b/sys-kernel/ck-sources/ChangeLog
index f30e883c4e6e..1efa086f7014 100644
--- a/sys-kernel/ck-sources/ChangeLog
+++ b/sys-kernel/ck-sources/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-kernel/ck-sources
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.89 2005/03/03 08:46:50 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ChangeLog,v 1.90 2005/03/12 21:52:05 marineam Exp $
+
+*ck-sources-2.6.11-r2 (12 Mar 2005)
+
+  12 Mar 2005; Micheal Marineau <marineam@gentoo.org>
+  +files/ck-sources-2.6.11-lowmem-reserve-oops.patch,
+  -ck-sources-2.6.11-r1.ebuild, +ck-sources-2.6.11-r2.ebuild:
+  Version bump, and pull in a divide by zero oops fix from g-d-s
 
 *ck-sources-2.6.11-r1 (02 Mar 2005)
 
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index 77f40c20cb97..2e6f4174f153 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -1,8 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+MD5 fbeb84fa6ced2db05e22f1357d8c2b4b ck-sources-2.6.11-r2.ebuild 809
 MD5 07d302d5021bc0635909da0cf1bb90dc ck-sources-2.4.28-r3.ebuild 1272
-MD5 1cc1bf32065a77853dcd94b5b822cd9a ck-sources-2.6.11-r1.ebuild 765
 MD5 031aa1e95e1b18610b920452acae51fc ChangeLog 19671
 MD5 7187b8c28501f454a2412c9e4a7fcf53 metadata.xml 421
 MD5 1d78b90e495e432432e095ee47bbc2fc files/ck-sources-2.4.28.77094.patch 452
@@ -12,6 +9,7 @@ MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/ck-sources-2.4.28.CAN-2004-1016.patch
 MD5 7695b79187fcc27339ab62af1112ec11 files/ck-sources-2.6.11-74070.patch 525
 MD5 6cf860a301930c8cac126ab0c4d859d4 files/ck-sources-2.4.28.brk-locked.patch 8202
 MD5 d1ccc2047be533c992f67270a150a210 files/ck-sources-2.4.28.cmdlineLeak.patch 388
+MD5 38e8ce7cb288b0b9ed6ceb58d4103547 files/ck-sources-2.6.11-lowmem-reserve-oops.patch 2788
 MD5 c27699e9d62f7d46213bd51f87636163 files/ck-sources-2.4.28.vma.patch 8143
 MD5 ea61cd84e266e1ddfa963d27e9c1ba99 files/digest-ck-sources-2.4.28-r3 210
 MD5 79a76d3cb0029b85d4303b0019e788a8 files/ck-sources-2.4.28.compileFix.patch 2070
@@ -19,12 +17,5 @@ MD5 b9a94233e1457787352e5f85e3e3582d files/ck-sources-2.4.28.binfmt_a.out.patch
 MD5 0f93b46ae17cbd0fc9b4d1cf5d704296 files/ck-sources-2.4.28.81106.patch 2243
 MD5 757ee1239c3f14645ccea3640d551e11 files/ck-sources-2.4.28.CAN-2004-1056.patch 11249
 MD5 b6cd2468a246169a6e2f969c44e3f341 files/ck-sources-2.4.28.78362.patch 10372
-MD5 4045e98ed6d3fcc11ee1a7fcd523c258 files/digest-ck-sources-2.6.11-r1 131
+MD5 afa82ff12c32718492d20f7f28b72631 files/digest-ck-sources-2.6.11-r2 131
 MD5 1efe4024e443e60db5fd9b21b22fabd2 files/ck-sources-2.4.28.77666.patch 1724
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCJs8NnVkA0cTr1F4RAtOpAJ44/u3jvmb+Sm52GiODcnXt/sFwdgCfXMlf
-V0NFDbuKQOmAI+dEtae71z8=
-=gsqk
------END PGP SIGNATURE-----
diff --git a/sys-kernel/ck-sources/ck-sources-2.6.11-r1.ebuild b/sys-kernel/ck-sources/ck-sources-2.6.11-r2.ebuild
index 259f76d0fef9..311de0c1752a 100644
--- a/sys-kernel/ck-sources/ck-sources-2.6.11-r1.ebuild
+++ b/sys-kernel/ck-sources/ck-sources-2.6.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.11-r1.ebuild,v 1.1 2005/03/03 08:46:50 marineam Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/ck-sources/ck-sources-2.6.11-r2.ebuild,v 1.1 2005/03/12 21:52:05 marineam Exp $
 
 K_PREPATCHED="yes"
 UNIPATCH_STRICTORDER="yes"
@@ -14,7 +14,8 @@ detect_version
 CK_PATCH="patch-${KV_FULL}.bz2"
 UNIPATCH_LIST="
 	${DISTDIR}/${CK_PATCH}
-	${FILESDIR}/${P}-74070.patch"
+	${FILESDIR}/${P}-74070.patch
+	${FILESDIR}/${P}-lowmem-reserve-oops.patch"
 IUSE=""
 
 DESCRIPTION="Full sources for the Stock Linux kernel and Con Kolivas's high performance patchset"
diff --git a/sys-kernel/ck-sources/files/ck-sources-2.6.11-lowmem-reserve-oops.patch b/sys-kernel/ck-sources/files/ck-sources-2.6.11-lowmem-reserve-oops.patch
new file mode 100644
index 000000000000..42fbfe236b91
--- /dev/null
+++ b/sys-kernel/ck-sources/files/ck-sources-2.6.11-lowmem-reserve-oops.patch
@@ -0,0 +1,78 @@
+
+
+If you do 'echo 0 0 > /proc/sys/vm/lowmem_reserve_ratio' the kernel gets a
+divide-by-zero.
+
+Prevent that, and fiddle with some whitespace too.
+
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+---
+
+ 25-akpm/mm/page_alloc.c |   21 +++++++++++++++------
+ 1 files changed, 15 insertions(+), 6 deletions(-)
+
+diff -puN mm/page_alloc.c~setup_per_zone_lowmem_reserve-oops-fix mm/page_alloc.c
+--- 25/mm/page_alloc.c~setup_per_zone_lowmem_reserve-oops-fix	2005-03-01 00:13:57.000000000 -0800
++++ 25-akpm/mm/page_alloc.c	2005-03-01 00:13:57.000000000 -0800
+@@ -37,13 +37,17 @@
+ #include <asm/tlbflush.h>
+ #include "internal.h"
+ 
+-/* MCD - HACK: Find somewhere to initialize this EARLY, or make this initializer cleaner */
++/*
++ * MCD - HACK: Find somewhere to initialize this EARLY, or make this
++ * initializer cleaner
++ */
+ nodemask_t node_online_map = { { [0] = 1UL } };
+ nodemask_t node_possible_map = NODE_MASK_ALL;
+ struct pglist_data *pgdat_list;
+ unsigned long totalram_pages;
+ unsigned long totalhigh_pages;
+ long nr_swap_pages;
++
+ /*
+  * results with 256, 32 in the lowmem_reserve sysctl:
+  *	1G machine -> (16M dma, 800M-16M normal, 1G-800M high)
+@@ -1924,15 +1928,20 @@ static void setup_per_zone_lowmem_reserv
+ 
+ 	for_each_pgdat(pgdat) {
+ 		for (j = 0; j < MAX_NR_ZONES; j++) {
+-			struct zone * zone = pgdat->node_zones + j;
++			struct zone *zone = pgdat->node_zones + j;
+ 			unsigned long present_pages = zone->present_pages;
+ 
+ 			zone->lowmem_reserve[j] = 0;
+ 
+ 			for (idx = j-1; idx >= 0; idx--) {
+-				struct zone * lower_zone = pgdat->node_zones + idx;
++				struct zone *lower_zone;
++
++				if (sysctl_lowmem_reserve_ratio[idx] < 1)
++					sysctl_lowmem_reserve_ratio[idx] = 1;
+ 
+-				lower_zone->lowmem_reserve[j] = present_pages / sysctl_lowmem_reserve_ratio[idx];
++				lower_zone = pgdat->node_zones + idx;
++				lower_zone->lowmem_reserve[j] = present_pages /
++					sysctl_lowmem_reserve_ratio[idx];
+ 				present_pages += lower_zone->present_pages;
+ 			}
+ 		}
+@@ -2039,7 +2048,7 @@ module_init(init_per_zone_pages_min)
+  *	changes.
+  */
+ int min_free_kbytes_sysctl_handler(ctl_table *table, int write, 
+-		struct file *file, void __user *buffer, size_t *length, loff_t *ppos)
++	struct file *file, void __user *buffer, size_t *length, loff_t *ppos)
+ {
+ 	proc_dointvec(table, write, file, buffer, length, ppos);
+ 	setup_per_zone_pages_min();
+@@ -2056,7 +2065,7 @@ int min_free_kbytes_sysctl_handler(ctl_t
+  * if in function of the boot time zone sizes.
+  */
+ int lowmem_reserve_ratio_sysctl_handler(ctl_table *table, int write,
+-		 struct file *file, void __user *buffer, size_t *length, loff_t *ppos)
++	struct file *file, void __user *buffer, size_t *length, loff_t *ppos)
+ {
+ 	proc_dointvec_minmax(table, write, file, buffer, length, ppos);
+ 	setup_per_zone_lowmem_reserve();
+_
diff --git a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11-r1 b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11-r2
index e918c02547ea..6dd39f852c87 100644
--- a/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11-r1
+++ b/sys-kernel/ck-sources/files/digest-ck-sources-2.6.11-r2
@@ -1,2 +1,2 @@
 MD5 f00fd1b5a80f52baf9d1d83acddfa325 linux-2.6.11.tar.bz2 37075679
-MD5 83b1ffcd7a37522fab36913f85088169 patch-2.6.11-ck1.bz2 37569
+MD5 a62ac43ed170249cc06af5c776e622db patch-2.6.11-ck2.bz2 37622