Merge tag 'rproc-v4.20' of git://github.com/andersson/remoteproc

[sfrench/cifs-2.6.git] / arch / alpha / kernel / core_irongate.c

diff --git a/arch/alpha/kernel/core_irongate.c b/arch/alpha/kernel/core_irongate.c
index aec757250e074cc2b95c1a903a4c45dd0be9bb7a..f70986683fc6150eeebefde4d1d0742d35d7adb6 100644 (file)
--- a/arch/alpha/kernel/core_irongate.c
+++ b/arch/alpha/kernel/core_irongate.c
@@ -21,6 +21,7 @@
 #include <linux/init.h>
 #include <linux/initrd.h>
 #include <linux/bootmem.h>
+#include <linux/memblock.h>
 
 #include <asm/ptrace.h>
 #include <asm/cacheflush.h>
@@ -241,8 +242,7 @@ albacore_init_arch(void)
                                       size / 1024);
                }
 #endif
-               reserve_bootmem_node(NODE_DATA(0), pci_mem, memtop -
-                               pci_mem, BOOTMEM_DEFAULT);
+               memblock_reserve(pci_mem, memtop - pci_mem);
                printk("irongate_init_arch: temporarily reserving "
                        "region %08lx-%08lx for PCI\n", pci_mem, memtop - 1);
        }