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