[PATCH] x86: make generic arch support NUMAQ - fix #2

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Yinghai Lu
Date: Monday, June 9, 2008 - 6:11 pm

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)
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[patch 08/19] slub/slabinfo: add defrag statistics, Christoph Lameter, (Fri May 9, 7:21 pm)
RFC [PATCH] x86: make generic arch support NUMAQ, Yinghai Lu, (Thu Jun 5, 3:09 am)
Re: RFC [PATCH] x86: make generic arch support NUMAQ, Sam Ravnborg, (Thu Jun 5, 4:00 am)
Re: RFC [PATCH] x86: make generic arch support NUMAQ, Ingo Molnar, (Thu Jun 5, 5:39 am)
Re: RFC [PATCH] x86: make generic arch support NUMAQ, Yinghai Lu, (Thu Jun 5, 10:26 am)
Re: RFC [PATCH] x86: make generic arch support NUMAQ, Yinghai Lu, (Thu Jun 5, 10:33 am)
[PATCH] x86: make generic arch support NUMAQ v2, Yinghai Lu, (Thu Jun 5, 5:14 pm)
Re: [PATCH] x86: make generic arch support NUMAQ v2, Yinghai Lu, (Thu Jun 5, 5:54 pm)
Re: [PATCH] x86: make generic arch support NUMAQ v2, Sam Ravnborg, (Thu Jun 5, 11:17 pm)
Re: [PATCH] x86: make generic arch support NUMAQ v2, Yinghai Lu, (Thu Jun 5, 11:27 pm)
Re: [PATCH] x86: make generic arch support NUMAQ v2, Ingo Molnar, (Fri Jun 6, 7:09 am)
Re: [PATCH] x86: make generic arch support NUMAQ v2, Yinghai Lu, (Fri Jun 6, 11:05 am)
[PATCH] x86: make generic arch support NUMAQ v3, Yinghai Lu, (Fri Jun 6, 2:41 pm)
[PATCH] x86: make generic arch support NUMAQ v4, Yinghai Lu, (Sat Jun 7, 12:31 am)
[PATCH] x86: make generic arch support NUMAQ v5, Yinghai Lu, (Sun Jun 8, 6:31 pm)
Re: [PATCH] x86: make generic arch support NUMAQ v5, Andy Whitcroft, (Mon Jun 9, 7:41 am)
Re: [PATCH] x86: make generic arch support NUMAQ v5, Yinghai Lu, (Mon Jun 9, 11:00 am)
[PATCH] x86: make generic arch support NUMAQ - fix, Yinghai Lu, (Mon Jun 9, 5:00 pm)
[PATCH] x86: make generic arch support NUMAQ - fix #2, Yinghai Lu, (Mon Jun 9, 6:11 pm)
Re: [PATCH] x86: make generic arch support NUMAQ v5, Ingo Molnar, (Tue Jun 10, 2:55 am)