diff options
Diffstat (limited to 'arch/arm/mm/nommu.c')
| -rw-r--r-- | arch/arm/mm/nommu.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c index 33b327379f07..25376d480b8e 100644 --- a/arch/arm/mm/nommu.c +++ b/arch/arm/mm/nommu.c | |||
| @@ -18,20 +18,18 @@ | |||
| 18 | #include "mm.h" | 18 | #include "mm.h" |
| 19 | 19 | ||
| 20 | /* | 20 | /* |
| 21 | * Reserve the various regions of node 0 | 21 | * Reserve the various regions |
| 22 | */ | 22 | */ |
| 23 | void __init reserve_node_zero(pg_data_t *pgdat) | 23 | void __init reserve_special_regions(void) |
| 24 | { | 24 | { |
| 25 | /* | 25 | /* |
| 26 | * Register the kernel text and data with bootmem. | 26 | * Register the kernel text and data with bootmem. |
| 27 | * Note that this can only be in node 0. | 27 | * Note that this can only be in node 0. |
| 28 | */ | 28 | */ |
| 29 | #ifdef CONFIG_XIP_KERNEL | 29 | #ifdef CONFIG_XIP_KERNEL |
| 30 | reserve_bootmem_node(pgdat, __pa(_data), _end - _data, | 30 | reserve_bootmem(__pa(_data), _end - _data, BOOTMEM_DEFAULT); |
| 31 | BOOTMEM_DEFAULT); | ||
| 32 | #else | 31 | #else |
| 33 | reserve_bootmem_node(pgdat, __pa(_stext), _end - _stext, | 32 | reserve_bootmem(__pa(_stext), _end - _stext, BOOTMEM_DEFAULT); |
| 34 | BOOTMEM_DEFAULT); | ||
| 35 | #endif | 33 | #endif |
| 36 | 34 | ||
| 37 | /* | 35 | /* |
| @@ -39,8 +37,7 @@ void __init reserve_node_zero(pg_data_t *pgdat) | |||
| 39 | * some architectures which the DRAM is the exception vector to trap, | 37 | * some architectures which the DRAM is the exception vector to trap, |
| 40 | * alloc_page breaks with error, although it is not NULL, but "0." | 38 | * alloc_page breaks with error, although it is not NULL, but "0." |
| 41 | */ | 39 | */ |
| 42 | reserve_bootmem_node(pgdat, CONFIG_VECTORS_BASE, PAGE_SIZE, | 40 | reserve_bootmem(CONFIG_VECTORS_BASE, PAGE_SIZE, BOOTMEM_DEFAULT); |
| 43 | BOOTMEM_DEFAULT); | ||
| 44 | } | 41 | } |
| 45 | 42 | ||
| 46 | /* | 43 | /* |
