Messages in this thread Patches in this message | | | Date | Tue, 19 Oct 1999 05:31:26 -0400 | From | Jeff Garzik <> | Subject | PATCH 2.3.23 pre 2 compile fixes |
| |
Attached are two patches against 2.3.23 pre 2.
arch/i386/kernel/setup.c: * (compile error) fix the memory_end compile problem everyone is having
drivers/net/starfire.c: * (compile error) needs version.h to avoid putting an extra struct field in where it doesn't belong
drivers/net/via-rhine.c: * (bad patch?) should not be defining ioremap into vremapdiff -urN linux-2.3.23-pre2/arch/i386/kernel/setup.c linux_2_3/arch/i386/kernel/setup.c --- linux-2.3.23-pre2/arch/i386/kernel/setup.c Mon Oct 18 23:31:45 1999 +++ linux_2_3/arch/i386/kernel/setup.c Tue Oct 19 04:38:25 1999 @@ -619,10 +619,10 @@ if (LOADER_TYPE) { initrd_start = INITRD_START ? INITRD_START + PAGE_OFFSET : 0; initrd_end = initrd_start+INITRD_SIZE; - if (initrd_end > memory_end) { + if (initrd_end > *memory_end_p) { printk("initrd extends beyond end of memory " "(0x%08lx > 0x%08lx)\ndisabling initrd\n", - initrd_end,memory_end); + initrd_end, *memory_end_p); initrd_start = 0; } }diff -urN linux-2.3.23-pre2/drivers/net/starfire.c linux_2_3/drivers/net/starfire.c --- linux-2.3.23-pre2/drivers/net/starfire.c Wed Sep 8 14:14:32 1999 +++ linux_2_3/drivers/net/starfire.c Tue Oct 19 04:38:25 1999 @@ -81,6 +81,7 @@ #endif #include <linux/kernel.h> +#include <linux/version.h> #include <linux/sched.h> #include <linux/string.h> #include <linux/timer.h> diff -urN linux-2.3.23-pre2/drivers/net/via-rhine.c linux_2_3/drivers/net/via-rhine.c --- linux-2.3.23-pre2/drivers/net/via-rhine.c Sat Oct 2 10:38:27 1999 +++ linux_2_3/drivers/net/via-rhine.c Tue Oct 19 04:38:26 1999 @@ -111,11 +111,6 @@ #ifdef MODULE char kernel_version[] = UTS_RELEASE; -#else -#ifndef __alpha__ -#define ioremap vremap -#define iounmap vfree -#endif #endif #if defined(MODULE) && LINUX_VERSION_CODE > 0x20115 MODULE_AUTHOR("Donald Becker <becker@cesdis.gsfc.nasa.gov>"); | |