.. | .. |
---|
20 | 20 | #include <linux/sched.h> |
---|
21 | 21 | #include <linux/init.h> |
---|
22 | 22 | #include <linux/initrd.h> |
---|
23 | | -#include <linux/bootmem.h> |
---|
| 23 | +#include <linux/memblock.h> |
---|
24 | 24 | |
---|
25 | 25 | #include <asm/ptrace.h> |
---|
26 | 26 | #include <asm/cacheflush.h> |
---|
.. | .. |
---|
233 | 233 | unsigned long size; |
---|
234 | 234 | |
---|
235 | 235 | 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)); |
---|
238 | 237 | if (!move_initrd(pci_mem)) |
---|
239 | 238 | printk("irongate_init_arch: initrd too big " |
---|
240 | 239 | "(%ldK)\ndisabling initrd\n", |
---|
241 | 240 | size / 1024); |
---|
242 | 241 | } |
---|
243 | 242 | #endif |
---|
244 | | - reserve_bootmem_node(NODE_DATA(0), pci_mem, memtop - |
---|
245 | | - pci_mem, BOOTMEM_DEFAULT); |
---|
| 243 | + memblock_reserve(pci_mem, memtop - pci_mem); |
---|
246 | 244 | printk("irongate_init_arch: temporarily reserving " |
---|
247 | 245 | "region %08lx-%08lx for PCI\n", pci_mem, memtop - 1); |
---|
248 | 246 | } |
---|
.. | .. |
---|
304 | 302 | #include <linux/agp_backend.h> |
---|
305 | 303 | #include <linux/agpgart.h> |
---|
306 | 304 | #include <linux/export.h> |
---|
307 | | -#include <asm/pgalloc.h> |
---|
308 | 305 | |
---|
309 | 306 | #define GET_PAGE_DIR_OFF(addr) (addr >> 22) |
---|
310 | 307 | #define GET_PAGE_DIR_IDX(addr) (GET_PAGE_DIR_OFF(addr)) |
---|