From: William Lee Irwin III <wli@holomorphy.com>
To: Andrew Morton <akpm@digeo.com>
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org
Subject: Re: 2.5.68-mm1
Date: Tue, 22 Apr 2003 23:41:03 -0700 [thread overview]
Message-ID: <20030423064103.GL8978@holomorphy.com> (raw)
In-Reply-To: <20030419231320.52b2b2ef.akpm@digeo.com>
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, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"aart@kvack.org"> aart@kvack.org </a>
prev parent reply other threads:[~2003-04-23 6:41 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2003-04-20 6:13 2.5.68-mm1 Andrew Morton
2003-04-20 13:02 ` 2.5.68-mm1 Felipe Alfaro Solana
2003-04-23 6:41 ` William Lee Irwin III [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20030423064103.GL8978@holomorphy.com \
--to=wli@holomorphy.com \
--cc=akpm@digeo.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox