All of lore.kernel.org
 help / color / mirror / Atom feed
From: Yinghai Lu <yhlu.kernel@gmail.com>
To: Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
	Andrew Morton <akpm@linux-foundation.org>,
	Sam Ravnborg <sam@ravnborg.org>,
	Thomas Gleixner <tglx@linutronix.de>
Cc: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: [PATCH] x86: make generic arch support NUMAQ - fix #2
Date: Mon, 9 Jun 2008 18:11:36 -0700	[thread overview]
Message-ID: <200806091811.36836.yhlu.kernel@gmail.com> (raw)
In-Reply-To: <200806081831.54869.yhlu.kernel@gmail.com>


do not need reserve if it early scan smp table

we are checking mptable early for numaq, so don't need to reserve_bootmem for
it.  bootmem is not there yet.

do the samething like 64 bit.

find it on 64g above system from 64 bit kernel kexec to 32 bit kernel with
numaq support

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>

diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 6ae6090..7ac1b68 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -853,9 +853,13 @@ static int __init smp_scan_config(unsigned long base, unsigned long length,
 			smp_found_config = 1;
 #endif
 			mpf_found = mpf;
-#ifdef CONFIG_X86_32
+
 			printk(KERN_INFO "found SMP MP-table at [%p] %08lx\n",
 			       mpf, virt_to_phys(mpf));
+
+			if (!reserve)
+				return 1;
+#ifdef CONFIG_X86_32
 			reserve_bootmem(virt_to_phys(mpf), PAGE_SIZE,
 					BOOTMEM_DEFAULT);
 			if (mpf->mpf_physptr) {
@@ -877,9 +881,6 @@ static int __init smp_scan_config(unsigned long base, unsigned long length,
 			}
 
 #else
-			if (!reserve)
-				return 1;
-
 			reserve_bootmem_generic(virt_to_phys(mpf), PAGE_SIZE,
 				BOOTMEM_DEFAULT);
 			if (mpf->mpf_physptr)

  parent reply	other threads:[~2008-06-10  1:11 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-05 10:09 RFC [PATCH] x86: make generic arch support NUMAQ Yinghai Lu
2008-06-05 11:00 ` Sam Ravnborg
2008-06-05 12:39   ` Ingo Molnar
2008-06-05 17:33     ` Yinghai Lu
2008-06-05 17:26   ` Yinghai Lu
2008-06-06  0:14 ` [PATCH] x86: make generic arch support NUMAQ v2 Yinghai Lu
2008-06-06  0:54   ` Yinghai Lu
2008-06-06  6:17     ` Sam Ravnborg
2008-06-06  6:27       ` Yinghai Lu
2008-06-06 14:09         ` Ingo Molnar
2008-06-06 18:05           ` Yinghai Lu
2008-06-06 21:41   ` [PATCH] x86: make generic arch support NUMAQ v3 Yinghai Lu
2008-06-07  7:31     ` [PATCH] x86: make generic arch support NUMAQ v4 Yinghai Lu
2008-06-09  1:29       ` [PATCH] x86: introduce max_physical_apicid for bigsmp switching Yinghai Lu
2008-06-10  9:53         ` Ingo Molnar
2008-06-09  1:31       ` [PATCH] x86: make generic arch support NUMAQ v5 Yinghai Lu
2008-06-09 14:41         ` Andy Whitcroft
2008-06-09 18:00           ` Yinghai Lu
2008-06-10  0:00         ` [PATCH] x86: make generic arch support NUMAQ - fix Yinghai Lu
2008-06-10  1:11         ` Yinghai Lu [this message]
2008-06-10  9:55         ` [PATCH] x86: make generic arch support NUMAQ v5 Ingo Molnar

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=200806091811.36836.yhlu.kernel@gmail.com \
    --to=yhlu.kernel@gmail.com \
    --cc=akpm@linux-foundation.org \
    --cc=hpa@zytor.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=sam@ravnborg.org \
    --cc=tglx@linutronix.de \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.