Re: nvidia-kernel-1.0.4496 fails to compile with wolk-4.9
Marc-Christian Petersen <[email protected]>
| Newsgroups | gmane.linux.wolk.devel |
|---|---|
| Organization | Working Overloaded Linux Kernel |
| Message-ID | <[email protected]> |
On Monday 01 September 2003 19:19, Jan Huelsbergen wrote: Hi Jan, > I experience the same problem here. The patch doesn't change it. okey, now let's do it right. Attached patch _works_ :) *imho* ;) > P.S.: Thank you very much for the great work you do with WOLK! thank you very much for the words :) ciao, Marc
nvidia-fixup.patch
(text/x-diff, 3.5 KB)
diff -Naurp linux-2.4.20-wolk4.9-fullkernel/arch/i386/kernel/i386_ksyms.c linux-2.4.20-wolk4.10-fullkernel/arch/i386/kernel/i386_ksyms.c
--- linux-2.4.20-wolk4.9-fullkernel/arch/i386/kernel/i386_ksyms.c 2003-09-01 21:40:41.000000000 +0200
+++ linux-2.4.20-wolk4.10-fullkernel/arch/i386/kernel/i386_ksyms.c 2003-09-01 16:59:02.000000000 +0200
@@ -52,6 +52,7 @@ EXPORT_SYMBOL(drive_info);
extern unsigned long cpu_khz;
extern unsigned long get_cmos_time(void);
+extern unsigned long vmalloc_reserve;
/* platform dependent support */
EXPORT_SYMBOL(boot_cpu_data);
@@ -80,6 +81,7 @@ EXPORT_SYMBOL(gdt);
EXPORT_SYMBOL(gdt2);
#endif
EXPORT_SYMBOL(empty_zero_page);
+EXPORT_SYMBOL(vmalloc_reserve);
#ifdef CONFIG_DEBUG_IOVIRT
EXPORT_SYMBOL(__io_virt_debug);
diff -Naurp linux-2.4.20-wolk4.9-fullkernel/arch/i386/kernel/setup.c linux-2.4.20-wolk4.10-fullkernel/arch/i386/kernel/setup.c
--- linux-2.4.20-wolk4.9-fullkernel/arch/i386/kernel/setup.c 2003-09-01 21:40:59.000000000 +0200
+++ linux-2.4.20-wolk4.10-fullkernel/arch/i386/kernel/setup.c 2003-09-01 16:59:02.000000000 +0200
@@ -883,7 +883,7 @@ static void __init parse_cmdline_early (
* 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 -Naurp linux-2.4.20-wolk4.9-fullkernel/include/asm-i386/fixmap.h linux-2.4.20-wolk4.10-fullkernel/include/asm-i386/fixmap.h
--- linux-2.4.20-wolk4.9-fullkernel/include/asm-i386/fixmap.h 2003-05-13 12:18:44.000000000 +0200
+++ linux-2.4.20-wolk4.10-fullkernel/include/asm-i386/fixmap.h 2003-09-01 16:59:05.000000000 +0200
@@ -104,6 +104,7 @@ extern void __set_fixmap (enum fixed_add
#define FIXADDR_TOP (0xffffe000UL)
#define __FIXADDR_SIZE (__end_of_permanent_fixed_addresses << PAGE_SHIFT)
#define FIXADDR_START (FIXADDR_TOP - __FIXADDR_SIZE)
+#define __FIXADDR_START (FIXADDR_TOP - __FIXADDR_SIZE + PAGE_SIZE)
#define __fix_to_virt(x) (FIXADDR_TOP - ((x) << PAGE_SHIFT))
#define __virt_to_fix(x) ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT)
diff -Naurp linux-2.4.20-wolk4.9-fullkernel/include/asm-i386/page.h linux-2.4.20-wolk4.10-fullkernel/include/asm-i386/page.h
--- linux-2.4.20-wolk4.9-fullkernel/include/asm-i386/page.h 2003-09-01 21:41:02.000000000 +0200
+++ linux-2.4.20-wolk4.10-fullkernel/include/asm-i386/page.h 2003-09-01 16:59:02.000000000 +0200
@@ -85,13 +85,15 @@ typedef struct { unsigned long pgprot; }
* 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!
@@ -137,7 +139,7 @@ static __inline__ int get_order(unsigned
#endif /* __ASSEMBLY__ */
#define PAGE_OFFSET ((unsigned long)__PAGE_OFFSET)
-#define KERNEL_MEMORY ((unsigned long)(FIXADDR_START - __PAGE_OFFSET))
+#define KERNEL_MEMORY ((unsigned long)(__FIXADDR_START - __PAGE_OFFSET))
#define RESERVED_AREA ((unsigned long)__RESERVED_AREA)
#define KERNEL_MAXMEM ((unsigned long)(KERNEL_MEMORY - RESERVED_AREA))
#define __MAXMEM (-__PAGE_OFFSET-__VMALLOC_RESERVE_MAX)