diff options
Diffstat (limited to 'mm/bootmem.c')
-rw-r--r-- | mm/bootmem.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/mm/bootmem.c b/mm/bootmem.c index f0f85fa713ca..d53112fcb404 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c | |||
@@ -15,6 +15,7 @@ | |||
15 | 15 | ||
16 | #include <asm/bug.h> | 16 | #include <asm/bug.h> |
17 | #include <asm/io.h> | 17 | #include <asm/io.h> |
18 | #include <asm/processor.h> | ||
18 | 19 | ||
19 | #include "internal.h" | 20 | #include "internal.h" |
20 | 21 | ||
@@ -453,7 +454,9 @@ void * __init __alloc_bootmem_node(pg_data_t *pgdat, unsigned long size, | |||
453 | return __alloc_bootmem(size, align, goal); | 454 | return __alloc_bootmem(size, align, goal); |
454 | } | 455 | } |
455 | 456 | ||
456 | #define LOW32LIMIT 0xffffffff | 457 | #ifndef ARCH_LOW_ADDRESS_LIMIT |
458 | #define ARCH_LOW_ADDRESS_LIMIT 0xffffffffUL | ||
459 | #endif | ||
457 | 460 | ||
458 | void * __init __alloc_bootmem_low(unsigned long size, unsigned long align, | 461 | void * __init __alloc_bootmem_low(unsigned long size, unsigned long align, |
459 | unsigned long goal) | 462 | unsigned long goal) |
@@ -462,7 +465,8 @@ void * __init __alloc_bootmem_low(unsigned long size, unsigned long align, | |||
462 | void *ptr; | 465 | void *ptr; |
463 | 466 | ||
464 | list_for_each_entry(bdata, &bdata_list, list) { | 467 | list_for_each_entry(bdata, &bdata_list, list) { |
465 | ptr = __alloc_bootmem_core(bdata, size, align, goal, LOW32LIMIT); | 468 | ptr = __alloc_bootmem_core(bdata, size, align, goal, |
469 | ARCH_LOW_ADDRESS_LIMIT); | ||
466 | if (ptr) | 470 | if (ptr) |
467 | return ptr; | 471 | return ptr; |
468 | } | 472 | } |
@@ -478,5 +482,6 @@ void * __init __alloc_bootmem_low(unsigned long size, unsigned long align, | |||
478 | void * __init __alloc_bootmem_low_node(pg_data_t *pgdat, unsigned long size, | 482 | void * __init __alloc_bootmem_low_node(pg_data_t *pgdat, unsigned long size, |
479 | unsigned long align, unsigned long goal) | 483 | unsigned long align, unsigned long goal) |
480 | { | 484 | { |
481 | return __alloc_bootmem_core(pgdat->bdata, size, align, goal, LOW32LIMIT); | 485 | return __alloc_bootmem_core(pgdat->bdata, size, align, goal, |
486 | ARCH_LOW_ADDRESS_LIMIT); | ||
482 | } | 487 | } |