diff options
Diffstat (limited to 'arch/x86/kernel/mpparse.c')
-rw-r--r-- | arch/x86/kernel/mpparse.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index d86dbf7e54be..8252545ae6f3 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/init.h> | 11 | #include <linux/init.h> |
12 | #include <linux/delay.h> | 12 | #include <linux/delay.h> |
13 | #include <linux/bootmem.h> | 13 | #include <linux/bootmem.h> |
14 | #include <linux/memblock.h> | ||
14 | #include <linux/kernel_stat.h> | 15 | #include <linux/kernel_stat.h> |
15 | #include <linux/mc146818rtc.h> | 16 | #include <linux/mc146818rtc.h> |
16 | #include <linux/bitops.h> | 17 | #include <linux/bitops.h> |
@@ -641,7 +642,7 @@ static void __init smp_reserve_memory(struct mpf_intel *mpf) | |||
641 | { | 642 | { |
642 | unsigned long size = get_mpc_size(mpf->physptr); | 643 | unsigned long size = get_mpc_size(mpf->physptr); |
643 | 644 | ||
644 | reserve_early_overlap_ok(mpf->physptr, mpf->physptr+size, "MP-table mpc"); | 645 | memblock_x86_reserve_range(mpf->physptr, mpf->physptr+size, "* MP-table mpc"); |
645 | } | 646 | } |
646 | 647 | ||
647 | static int __init smp_scan_config(unsigned long base, unsigned long length) | 648 | static int __init smp_scan_config(unsigned long base, unsigned long length) |
@@ -670,7 +671,7 @@ static int __init smp_scan_config(unsigned long base, unsigned long length) | |||
670 | mpf, (u64)virt_to_phys(mpf)); | 671 | mpf, (u64)virt_to_phys(mpf)); |
671 | 672 | ||
672 | mem = virt_to_phys(mpf); | 673 | mem = virt_to_phys(mpf); |
673 | reserve_early_overlap_ok(mem, mem + sizeof(*mpf), "MP-table mpf"); | 674 | memblock_x86_reserve_range(mem, mem + sizeof(*mpf), "* MP-table mpf"); |
674 | if (mpf->physptr) | 675 | if (mpf->physptr) |
675 | smp_reserve_memory(mpf); | 676 | smp_reserve_memory(mpf); |
676 | 677 | ||