diff options
Diffstat (limited to 'arch/x86/kernel/mpparse.c')
-rw-r--r-- | arch/x86/kernel/mpparse.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index b02d4dd6b8a3..d2b56489d70f 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
@@ -27,7 +27,6 @@ | |||
27 | #include <asm/proto.h> | 27 | #include <asm/proto.h> |
28 | #include <asm/bios_ebda.h> | 28 | #include <asm/bios_ebda.h> |
29 | #include <asm/e820.h> | 29 | #include <asm/e820.h> |
30 | #include <asm/trampoline.h> | ||
31 | #include <asm/setup.h> | 30 | #include <asm/setup.h> |
32 | #include <asm/smp.h> | 31 | #include <asm/smp.h> |
33 | 32 | ||
@@ -568,8 +567,8 @@ static int __init smp_scan_config(unsigned long base, unsigned long length) | |||
568 | struct mpf_intel *mpf; | 567 | struct mpf_intel *mpf; |
569 | unsigned long mem; | 568 | unsigned long mem; |
570 | 569 | ||
571 | apic_printk(APIC_VERBOSE, "Scan SMP from %p for %ld bytes.\n", | 570 | apic_printk(APIC_VERBOSE, "Scan for SMP in [mem %#010lx-%#010lx]\n", |
572 | bp, length); | 571 | base, base + length - 1); |
573 | BUILD_BUG_ON(sizeof(*mpf) != 16); | 572 | BUILD_BUG_ON(sizeof(*mpf) != 16); |
574 | 573 | ||
575 | while (length > 0) { | 574 | while (length > 0) { |
@@ -584,8 +583,10 @@ static int __init smp_scan_config(unsigned long base, unsigned long length) | |||
584 | #endif | 583 | #endif |
585 | mpf_found = mpf; | 584 | mpf_found = mpf; |
586 | 585 | ||
587 | printk(KERN_INFO "found SMP MP-table at [%p] %llx\n", | 586 | printk(KERN_INFO "found SMP MP-table at [mem %#010llx-%#010llx] mapped at [%p]\n", |
588 | mpf, (u64)virt_to_phys(mpf)); | 587 | (unsigned long long) virt_to_phys(mpf), |
588 | (unsigned long long) virt_to_phys(mpf) + | ||
589 | sizeof(*mpf) - 1, mpf); | ||
589 | 590 | ||
590 | mem = virt_to_phys(mpf); | 591 | mem = virt_to_phys(mpf); |
591 | memblock_reserve(mem, sizeof(*mpf)); | 592 | memblock_reserve(mem, sizeof(*mpf)); |