![]() | ||||||||||
Messages in this thread Patch in this message |
On Sat, Apr 19, 2003 at 11:13:20PM -0700, Andrew Morton wrote: > ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.5/2.5.68/2.5.68-mm1 > A few fixes for various things. mainly a resync with 2.5.68. arch/i386/lib/kgdb_serial.c needs a fixup for CONFIG_DISCONTIGMEM: diff -urpN mm1-2.5.68-1/arch/i386/lib/kgdb_serial.c mm1-2.5.68-1B/arch/i386/lib/kgdb_serial.c --- mm1-2.5.68-1/arch/i386/lib/kgdb_serial.c 2003-04-20 00:24:45.000000000 -0700 +++ mm1-2.5.68-1B/arch/i386/lib/kgdb_serial.c 2003-04-22 23:24:15.000000000 -0700 @@ -25,6 +25,7 @@ #include <linux/ioport.h> #include <linux/mm.h> #include <linux/init.h> +#include <linux/highmem.h> #include <asm/system.h> #include <asm/io.h> #include <asm/segment.h> @@ -397,6 +398,18 @@ kgdb_enable_ints(void) void shutdown_for_kgdb(struct async_struct *gdb_async_info); #endif +#ifdef CONFIG_DISCONTIGMEM +static inline int kgdb_mem_init_done(void) +{ + return highmem_start_page != NULL; +} +#else +static inline int kgdb_mem_init_done(void) +{ + return max_mapnr != 0; +} +#endif + static void kgdb_enable_ints_now(void) { @@ -404,7 +417,8 @@ kgdb_enable_ints_now(void) return; if (!ints_disabled) goto exit; - if (max_mapnr && ints_disabled) { /* don't try till mem init */ + if (kgdb_mem_init_done() && + ints_disabled) { /* don't try till mem init */ #ifdef CONFIG_SERIAL_8250 /* * The ifdef here allows the system to be configured - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ | |||||||||
| Last update: 2005-03-22 12:34 [from the cache] ©2003-2008 | ||||||||||