From 70342a555e031b0cada201cfa007a9fb5ee93907 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Mon, 9 Jun 2008 18:11:36 -0700 Subject: [PATCH] --- yaml --- r: 99756 b: refs/heads/master c: b1f006b65c12b85df81f12c1073ad18fd26f4a16 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/mpparse.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a1167169d3e6..ea4bcd12bf3a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b20d70b70e9aa854c47d2af10659f1033b6d69bb +refs/heads/master: b1f006b65c12b85df81f12c1073ad18fd26f4a16 diff --git a/trunk/arch/x86/kernel/mpparse.c b/trunk/arch/x86/kernel/mpparse.c index 6ae60909b601..7ac1b689b70a 100644 --- a/trunk/arch/x86/kernel/mpparse.c +++ b/trunk/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)