diff options
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/mpparse.c | 10 | ||||
-rw-r--r-- | arch/x86/kernel/setup.c | 16 |
2 files changed, 14 insertions, 12 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index b02d4dd6b8a..fbca2e6223b 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
@@ -568,8 +568,8 @@ static int __init smp_scan_config(unsigned long base, unsigned long length) | |||
568 | struct mpf_intel *mpf; | 568 | struct mpf_intel *mpf; |
569 | unsigned long mem; | 569 | unsigned long mem; |
570 | 570 | ||
571 | apic_printk(APIC_VERBOSE, "Scan SMP from %p for %ld bytes.\n", | 571 | apic_printk(APIC_VERBOSE, "Scan for SMP in [mem %#010lx-%#010lx]\n", |
572 | bp, length); | 572 | base, base + length - 1); |
573 | BUILD_BUG_ON(sizeof(*mpf) != 16); | 573 | BUILD_BUG_ON(sizeof(*mpf) != 16); |
574 | 574 | ||
575 | while (length > 0) { | 575 | while (length > 0) { |
@@ -584,8 +584,10 @@ static int __init smp_scan_config(unsigned long base, unsigned long length) | |||
584 | #endif | 584 | #endif |
585 | mpf_found = mpf; | 585 | mpf_found = mpf; |
586 | 586 | ||
587 | printk(KERN_INFO "found SMP MP-table at [%p] %llx\n", | 587 | printk(KERN_INFO "found SMP MP-table at [mem %#010llx-%#010llx] mapped at [%p]\n", |
588 | mpf, (u64)virt_to_phys(mpf)); | 588 | (unsigned long long) virt_to_phys(mpf), |
589 | (unsigned long long) virt_to_phys(mpf) + | ||
590 | sizeof(*mpf) - 1, mpf); | ||
589 | 591 | ||
590 | mem = virt_to_phys(mpf); | 592 | mem = virt_to_phys(mpf); |
591 | memblock_reserve(mem, sizeof(*mpf)); | 593 | memblock_reserve(mem, sizeof(*mpf)); |
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index f2afee6a19c..982e44f960d 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -334,8 +334,8 @@ static void __init relocate_initrd(void) | |||
334 | memblock_reserve(ramdisk_here, area_size); | 334 | memblock_reserve(ramdisk_here, area_size); |
335 | initrd_start = ramdisk_here + PAGE_OFFSET; | 335 | initrd_start = ramdisk_here + PAGE_OFFSET; |
336 | initrd_end = initrd_start + ramdisk_size; | 336 | initrd_end = initrd_start + ramdisk_size; |
337 | printk(KERN_INFO "Allocated new RAMDISK: %08llx - %08llx\n", | 337 | printk(KERN_INFO "Allocated new RAMDISK: [mem %#010llx-%#010llx]\n", |
338 | ramdisk_here, ramdisk_here + ramdisk_size); | 338 | ramdisk_here, ramdisk_here + ramdisk_size - 1); |
339 | 339 | ||
340 | q = (char *)initrd_start; | 340 | q = (char *)initrd_start; |
341 | 341 | ||
@@ -366,8 +366,8 @@ static void __init relocate_initrd(void) | |||
366 | /* high pages is not converted by early_res_to_bootmem */ | 366 | /* high pages is not converted by early_res_to_bootmem */ |
367 | ramdisk_image = boot_params.hdr.ramdisk_image; | 367 | ramdisk_image = boot_params.hdr.ramdisk_image; |
368 | ramdisk_size = boot_params.hdr.ramdisk_size; | 368 | ramdisk_size = boot_params.hdr.ramdisk_size; |
369 | printk(KERN_INFO "Move RAMDISK from %016llx - %016llx to" | 369 | printk(KERN_INFO "Move RAMDISK from [mem %#010llx-%#010llx] to" |
370 | " %08llx - %08llx\n", | 370 | " [mem %#010llx-%#010llx]\n", |
371 | ramdisk_image, ramdisk_image + ramdisk_size - 1, | 371 | ramdisk_image, ramdisk_image + ramdisk_size - 1, |
372 | ramdisk_here, ramdisk_here + ramdisk_size - 1); | 372 | ramdisk_here, ramdisk_here + ramdisk_size - 1); |
373 | } | 373 | } |
@@ -392,8 +392,8 @@ static void __init reserve_initrd(void) | |||
392 | ramdisk_size, end_of_lowmem>>1); | 392 | ramdisk_size, end_of_lowmem>>1); |
393 | } | 393 | } |
394 | 394 | ||
395 | printk(KERN_INFO "RAMDISK: %08llx - %08llx\n", ramdisk_image, | 395 | printk(KERN_INFO "RAMDISK: [mem %#010llx-%#010llx]\n", ramdisk_image, |
396 | ramdisk_end); | 396 | ramdisk_end - 1); |
397 | 397 | ||
398 | 398 | ||
399 | if (ramdisk_end <= end_of_lowmem) { | 399 | if (ramdisk_end <= end_of_lowmem) { |
@@ -906,8 +906,8 @@ void __init setup_arch(char **cmdline_p) | |||
906 | setup_bios_corruption_check(); | 906 | setup_bios_corruption_check(); |
907 | #endif | 907 | #endif |
908 | 908 | ||
909 | printk(KERN_DEBUG "initial memory mapped : 0 - %08lx\n", | 909 | printk(KERN_DEBUG "initial memory mapped: [mem 0x00000000-%#010lx]\n", |
910 | max_pfn_mapped<<PAGE_SHIFT); | 910 | (max_pfn_mapped<<PAGE_SHIFT) - 1); |
911 | 911 | ||
912 | setup_trampolines(); | 912 | setup_trampolines(); |
913 | 913 | ||