diff options
Diffstat (limited to 'arch/parisc/mm')
-rw-r--r-- | arch/parisc/mm/init.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c index aa875fa43488..eb80f5e33d7d 100644 --- a/arch/parisc/mm/init.c +++ b/arch/parisc/mm/init.c | |||
@@ -315,11 +315,13 @@ static void __init setup_bootmem(void) | |||
315 | #define PDC_CONSOLE_IO_IODC_SIZE 32768 | 315 | #define PDC_CONSOLE_IO_IODC_SIZE 32768 |
316 | 316 | ||
317 | reserve_bootmem_node(NODE_DATA(0), 0UL, | 317 | reserve_bootmem_node(NODE_DATA(0), 0UL, |
318 | (unsigned long)(PAGE0->mem_free + PDC_CONSOLE_IO_IODC_SIZE)); | 318 | (unsigned long)(PAGE0->mem_free + |
319 | PDC_CONSOLE_IO_IODC_SIZE), BOOTMEM_DEFAULT); | ||
319 | reserve_bootmem_node(NODE_DATA(0), __pa((unsigned long)_text), | 320 | reserve_bootmem_node(NODE_DATA(0), __pa((unsigned long)_text), |
320 | (unsigned long)(_end - _text)); | 321 | (unsigned long)(_end - _text), BOOTMEM_DEFAULT); |
321 | reserve_bootmem_node(NODE_DATA(0), (bootmap_start_pfn << PAGE_SHIFT), | 322 | reserve_bootmem_node(NODE_DATA(0), (bootmap_start_pfn << PAGE_SHIFT), |
322 | ((bootmap_pfn - bootmap_start_pfn) << PAGE_SHIFT)); | 323 | ((bootmap_pfn - bootmap_start_pfn) << PAGE_SHIFT), |
324 | BOOTMEM_DEFAULT); | ||
323 | 325 | ||
324 | #ifndef CONFIG_DISCONTIGMEM | 326 | #ifndef CONFIG_DISCONTIGMEM |
325 | 327 | ||
@@ -328,7 +330,8 @@ static void __init setup_bootmem(void) | |||
328 | for (i = 0; i < npmem_holes; i++) { | 330 | for (i = 0; i < npmem_holes; i++) { |
329 | reserve_bootmem_node(NODE_DATA(0), | 331 | reserve_bootmem_node(NODE_DATA(0), |
330 | (pmem_holes[i].start_pfn << PAGE_SHIFT), | 332 | (pmem_holes[i].start_pfn << PAGE_SHIFT), |
331 | (pmem_holes[i].pages << PAGE_SHIFT)); | 333 | (pmem_holes[i].pages << PAGE_SHIFT), |
334 | BOOTMEM_DEFAULT); | ||
332 | } | 335 | } |
333 | #endif | 336 | #endif |
334 | 337 | ||
@@ -346,7 +349,8 @@ static void __init setup_bootmem(void) | |||
346 | initrd_below_start_ok = 1; | 349 | initrd_below_start_ok = 1; |
347 | printk(KERN_INFO "initrd: reserving %08lx-%08lx (mem_max %08lx)\n", __pa(initrd_start), __pa(initrd_start) + initrd_reserve, mem_max); | 350 | printk(KERN_INFO "initrd: reserving %08lx-%08lx (mem_max %08lx)\n", __pa(initrd_start), __pa(initrd_start) + initrd_reserve, mem_max); |
348 | 351 | ||
349 | reserve_bootmem_node(NODE_DATA(0),__pa(initrd_start), initrd_reserve); | 352 | reserve_bootmem_node(NODE_DATA(0), __pa(initrd_start), |
353 | initrd_reserve, BOOTMEM_DEFAULT); | ||
350 | } | 354 | } |
351 | } | 355 | } |
352 | #endif | 356 | #endif |