Messages in this thread Patch in this message | | | From | Yinghai Lu <> | Subject | [PATCH] x86: make generic arch support NUMAQ - fix #2 | Date | Mon, 9 Jun 2008 18:11:36 -0700 |
| |
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)
| |