3 files changed, 4 insertions, 3 deletions

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index e8fea7ffa306..f5ea6415b778 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -933,7 +933,8 @@ static int __init acpi_parse_hpet(struct acpi_table_header *table)
          * the resource tree during the lateinit timeframe.
          */
 #define HPET_RESOURCE_NAME_SIZE 9
-        hpet_res = alloc_bootmem(sizeof(*hpet_res) + HPET_RESOURCE_NAME_SIZE);
+        hpet_res = memblock_alloc(sizeof(*hpet_res) + HPET_RESOURCE_NAME_SIZE,
+                                  0);
 
         hpet_res->name = (void *)&hpet_res[1];
         hpet_res->flags = IORESOURCE_MEM;
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index e25118f8a726..8c7450900e0e 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -2578,7 +2578,7 @@ static struct resource * __init ioapic_setup_resources(void)
         n = IOAPIC_RESOURCE_NAME_SIZE + sizeof(struct resource);
         n *= nr_ioapics;
 
-        mem = alloc_bootmem(n);
+        mem = memblock_alloc(n, 0);
         res = (void *)mem;
 
         mem += sizeof(struct resource) * nr_ioapics;
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index d1f25c831447..a0ec4c37265a 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -1094,7 +1094,7 @@ void __init e820__reserve_resources(void)
         struct resource *res;
         u64 end;
 
-        res = alloc_bootmem(sizeof(*res) * e820_table->nr_entries);
+        res = memblock_alloc(sizeof(*res) * e820_table->nr_entries, 0);
         e820_res = res;
 
         for (i = 0; i < e820_table->nr_entries; i++) {