hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/arch/alpha/kernel/core_irongate.c
....@@ -20,7 +20,7 @@
2020 #include <linux/sched.h>
2121 #include <linux/init.h>
2222 #include <linux/initrd.h>
23
-#include <linux/bootmem.h>
23
+#include <linux/memblock.h>
2424
2525 #include <asm/ptrace.h>
2626 #include <asm/cacheflush.h>
....@@ -233,16 +233,14 @@
233233 unsigned long size;
234234
235235 size = initrd_end - initrd_start;
236
- free_bootmem_node(NODE_DATA(0), __pa(initrd_start),
237
- PAGE_ALIGN(size));
236
+ memblock_free(__pa(initrd_start), PAGE_ALIGN(size));
238237 if (!move_initrd(pci_mem))
239238 printk("irongate_init_arch: initrd too big "
240239 "(%ldK)\ndisabling initrd\n",
241240 size / 1024);
242241 }
243242 #endif
244
- reserve_bootmem_node(NODE_DATA(0), pci_mem, memtop -
245
- pci_mem, BOOTMEM_DEFAULT);
243
+ memblock_reserve(pci_mem, memtop - pci_mem);
246244 printk("irongate_init_arch: temporarily reserving "
247245 "region %08lx-%08lx for PCI\n", pci_mem, memtop - 1);
248246 }
....@@ -304,7 +302,6 @@
304302 #include <linux/agp_backend.h>
305303 #include <linux/agpgart.h>
306304 #include <linux/export.h>
307
-#include <asm/pgalloc.h>
308305
309306 #define GET_PAGE_DIR_OFF(addr) (addr >> 22)
310307 #define GET_PAGE_DIR_IDX(addr) (GET_PAGE_DIR_OFF(addr))