diff options
Diffstat (limited to 'arch/alpha')
-rw-r--r-- | arch/alpha/kernel/core_irongate.c | 3 | ||||
-rw-r--r-- | arch/alpha/kernel/setup.c | 5 | ||||
-rw-r--r-- | arch/alpha/mm/numa.c | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/arch/alpha/kernel/core_irongate.c b/arch/alpha/kernel/core_irongate.c index e4a0bcf1d28b..a872078497be 100644 --- a/arch/alpha/kernel/core_irongate.c +++ b/arch/alpha/kernel/core_irongate.c | |||
@@ -241,7 +241,8 @@ albacore_init_arch(void) | |||
241 | size / 1024); | 241 | size / 1024); |
242 | } | 242 | } |
243 | #endif | 243 | #endif |
244 | reserve_bootmem_node(NODE_DATA(0), pci_mem, memtop - pci_mem); | 244 | reserve_bootmem_node(NODE_DATA(0), pci_mem, memtop - |
245 | pci_mem, BOOTMEM_DEFAULT); | ||
245 | printk("irongate_init_arch: temporarily reserving " | 246 | printk("irongate_init_arch: temporarily reserving " |
246 | "region %08lx-%08lx for PCI\n", pci_mem, memtop - 1); | 247 | "region %08lx-%08lx for PCI\n", pci_mem, memtop - 1); |
247 | } | 248 | } |
diff --git a/arch/alpha/kernel/setup.c b/arch/alpha/kernel/setup.c index beff6297f788..74c346625658 100644 --- a/arch/alpha/kernel/setup.c +++ b/arch/alpha/kernel/setup.c | |||
@@ -428,7 +428,8 @@ setup_memory(void *kernel_end) | |||
428 | } | 428 | } |
429 | 429 | ||
430 | /* Reserve the bootmap memory. */ | 430 | /* Reserve the bootmap memory. */ |
431 | reserve_bootmem(PFN_PHYS(bootmap_start), bootmap_size); | 431 | reserve_bootmem(PFN_PHYS(bootmap_start), bootmap_size, |
432 | BOOTMEM_DEFAULT); | ||
432 | printk("reserving pages %ld:%ld\n", bootmap_start, bootmap_start+PFN_UP(bootmap_size)); | 433 | printk("reserving pages %ld:%ld\n", bootmap_start, bootmap_start+PFN_UP(bootmap_size)); |
433 | 434 | ||
434 | #ifdef CONFIG_BLK_DEV_INITRD | 435 | #ifdef CONFIG_BLK_DEV_INITRD |
@@ -446,7 +447,7 @@ setup_memory(void *kernel_end) | |||
446 | phys_to_virt(PFN_PHYS(max_low_pfn))); | 447 | phys_to_virt(PFN_PHYS(max_low_pfn))); |
447 | } else { | 448 | } else { |
448 | reserve_bootmem(virt_to_phys((void *)initrd_start), | 449 | reserve_bootmem(virt_to_phys((void *)initrd_start), |
449 | INITRD_SIZE); | 450 | INITRD_SIZE, BOOTMEM_DEFAULT); |
450 | } | 451 | } |
451 | } | 452 | } |
452 | #endif /* CONFIG_BLK_DEV_INITRD */ | 453 | #endif /* CONFIG_BLK_DEV_INITRD */ |
diff --git a/arch/alpha/mm/numa.c b/arch/alpha/mm/numa.c index e3e3806a6f25..10ab7833e83c 100644 --- a/arch/alpha/mm/numa.c +++ b/arch/alpha/mm/numa.c | |||
@@ -242,7 +242,8 @@ setup_memory_node(int nid, void *kernel_end) | |||
242 | } | 242 | } |
243 | 243 | ||
244 | /* Reserve the bootmap memory. */ | 244 | /* Reserve the bootmap memory. */ |
245 | reserve_bootmem_node(NODE_DATA(nid), PFN_PHYS(bootmap_start), bootmap_size); | 245 | reserve_bootmem_node(NODE_DATA(nid), PFN_PHYS(bootmap_start), |
246 | bootmap_size, BOOTMEM_DEFAULT); | ||
246 | printk(" reserving pages %ld:%ld\n", bootmap_start, bootmap_start+PFN_UP(bootmap_size)); | 247 | printk(" reserving pages %ld:%ld\n", bootmap_start, bootmap_start+PFN_UP(bootmap_size)); |
247 | 248 | ||
248 | node_set_online(nid); | 249 | node_set_online(nid); |
@@ -281,7 +282,7 @@ setup_memory(void *kernel_end) | |||
281 | nid = kvaddr_to_nid(initrd_start); | 282 | nid = kvaddr_to_nid(initrd_start); |
282 | reserve_bootmem_node(NODE_DATA(nid), | 283 | reserve_bootmem_node(NODE_DATA(nid), |
283 | virt_to_phys((void *)initrd_start), | 284 | virt_to_phys((void *)initrd_start), |
284 | INITRD_SIZE); | 285 | INITRD_SIZE, BOOTMEM_DEFAULT); |
285 | } | 286 | } |
286 | } | 287 | } |
287 | #endif /* CONFIG_BLK_DEV_INITRD */ | 288 | #endif /* CONFIG_BLK_DEV_INITRD */ |