fixed nvidia patches and minor syns

6 files changed, 43 insertions, 7 deletions

diff --git a/sys-kernel/wolk-sources/ChangeLog b/sys-kernel/wolk-sources/ChangeLog
index 0b9a7ffdd892..4635f7078d50 100644
--- a/sys-kernel/wolk-sources/ChangeLog
+++ b/sys-kernel/wolk-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-kernel/wolk-sources
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.23 2003/11/14 16:42:00 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/ChangeLog,v 1.24 2003/11/14 20:26:09 nerdboy Exp $
+
+  14 Nov 2003; <nerdboy@gentoo.org> wolk-sources-4.10_pre7.ebuild,
+  wolk-sources-4.9-r1.ebuild:
+  fixed nvidia patches (i think)
 
 *wolk-sources-4.9-r1 (13 Nov 2003)
 
diff --git a/sys-kernel/wolk-sources/Manifest b/sys-kernel/wolk-sources/Manifest
index 8e9e4c90899f..191021c9ec21 100644
--- a/sys-kernel/wolk-sources/Manifest
+++ b/sys-kernel/wolk-sources/Manifest
@@ -1,9 +1,9 @@
-MD5 501b50689de99e3e6617129ad48ee560 ChangeLog 10653
+MD5 1baabb2e50aeea8e060170e4b0ab9a6f ChangeLog 10651
 MD5 6c4ddb4c38f70fdd525a6c1491e8f902 wolk-sources-3.8.ebuild 982
 MD5 66466d03cb44d91d51356acceb74dac2 wolk-sources-4.0.ebuild 1515
 MD5 ef292bc542c6ff521505a92d26203b70 wolk-sources-4.9.ebuild 1942
-MD5 1eb2eeed75f2fcc9d27a0713bd23c239 wolk-sources-4.10_pre7.ebuild 3694
-MD5 d949134e4f402eef205151b09b1df7bd wolk-sources-4.9-r1.ebuild 3790
+MD5 a5dff68a0eed18886c58e9828c88a11b wolk-sources-4.10_pre7.ebuild 3811
+MD5 ae819677a635e75cd48aed972a6c6bd0 wolk-sources-4.9-r1.ebuild 3904
 MD5 e879683268ec4b9136b2b699abd8a441 wolk-sources-4.3.ebuild 1954
 MD5 6fd890f722da90b57c3c3f37ff79c75e metadata.xml 226
 MD5 37d14c054323764430ce967a1de85a02 files/digest-wolk-sources-3.8 151
diff --git a/sys-kernel/wolk-sources/files/wolk-4.9s-page.h.patch b/sys-kernel/wolk-sources/files/wolk-4.9s-page.h.patch
new file mode 100644
index 000000000000..b6cdcd52f71c
--- /dev/null
+++ b/sys-kernel/wolk-sources/files/wolk-4.9s-page.h.patch
@@ -0,0 +1,20 @@
+--- include/asm-i386/page.h.orig	2003-09-03 18:37:01.000000000 +0200
++++ include/asm-i386/page.h	2003-09-03 20:12:28.000000000 +0200
+@@ -85,13 +85,14 @@
+  * as well as fixmap mappings.
+  */
+ #define __VMALLOC_RESERVE_MIN		(32 << 20)
+-#define __VMALLOC_RESERVE_DEFAULT	(128 << 20)
+-#define __VMALLOC_RESERVE_MAX		(480 << 20)
++#define __VMALLOC_RESERVE_DEFAULT	(192 << 20)
++#define __VMALLOC_RESERVE_MAX		(800 << 20)
+ #define __RESERVED_AREA			(10 << 20)
+ 
+-
+ #ifndef __ASSEMBLY__
+ 
++extern unsigned long vmalloc_reserve;
++
+ /*
+  * Tell the user there is some problem. Beep too, so we can
+  * see^H^H^Hhear bugs in early bootup as well!
diff --git a/sys-kernel/wolk-sources/files/wolk-4.9s-setup.c.patch b/sys-kernel/wolk-sources/files/wolk-4.9s-setup.c.patch
new file mode 100644
index 000000000000..18699a2dd4bb
--- /dev/null
+++ b/sys-kernel/wolk-sources/files/wolk-4.9s-setup.c.patch
@@ -0,0 +1,11 @@
+--- arch/i386/kernel/setup.c.orig	2003-09-03 18:31:28.000000000 +0200
++++ arch/i386/kernel/setup.c	2003-09-03 18:33:03.000000000 +0200
+@@ -883,7 +883,7 @@
+ 		 * vm_reserve=size forces to reserve 'size' bytes for vmalloc and
+ 		 * ioremap areas minimum is 32 MB maximum is 800 MB
+ 		 * the default without vm_reserve depends on the total amount of
+-		 * memory the minimum default is 128 MB.
++		 * memory the minimum default is 192 MB.
+ 		 */
+ 		else if (!memcmp(from, "vm_reserve=", 11))
+ 			vm_reserve = memparse(from+11, &from);
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.10_pre7.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.10_pre7.ebuild
index 67380f9f21e7..93973b2801c7 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.10_pre7.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.10_pre7.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/wolk-sources/wolk-sources-4.10_pre7.ebuild,v 1.4 2003/11/14 16:42:00 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.10_pre7.ebuild,v 1.5 2003/11/14 20:26:09 nerdboy Exp $
 
 IUSE="build wolk-bootsplash wolk-supermount ipv6"
 
diff --git a/sys-kernel/wolk-sources/wolk-sources-4.9-r1.ebuild b/sys-kernel/wolk-sources/wolk-sources-4.9-r1.ebuild
index 0d98e485183c..e80e7655f8ef 100644
--- a/sys-kernel/wolk-sources/wolk-sources-4.9-r1.ebuild
+++ b/sys-kernel/wolk-sources/wolk-sources-4.9-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/wolk-sources/wolk-sources-4.9-r1.ebuild,v 1.2 2003/11/14 16:42:00 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/wolk-sources/wolk-sources-4.9-r1.ebuild,v 1.3 2003/11/14 20:26:09 nerdboy Exp $
 
 IUSE="build wolk-bootsplash wolk-supermount ipv6"
 
@@ -48,7 +48,8 @@ local PATCHEFILES="-wolk4.0s -wolk4.0s-to-4.1s -wolk4.1s-to-4.2s -wolk4.2s-to-4.
 		done
 
 	einfo "Applying nvidia patches"
-	# epatch ${FILESDIR}/wolk-4.9s-nvidia.patch || die
+	epatch ${FILESDIR}/wolk-4.9s-page.h.patch || die
+	epatch ${FILESDIR}/wolk-4.9s-setup.c.patch || die
 
 	einfo "Applying other needed patches"
 	epatch ${FILESDIR}/wolk-4.9s-speedstep.c.patch || die