diff options
author | Michal Simek <monstr@monstr.eu> | 2009-08-11 06:36:12 -0400 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2009-08-18 04:34:12 -0400 |
commit | 8f37b6c9852ff79cc8472c44ea6f6485dfd58bd2 (patch) | |
tree | ec228c1c21beb8e0373e96272d7efa1c6d7d07bf /arch/microblaze | |
parent | 2856ed35ead295a7cc8788d9ba860e746dfc92bb (diff) |
microblaze: Use klimit instead of _end for memory init
For noMMU system when you use larger rootfs image
there is problem with using _end label because
we increase klimit but in memory initialization
we use still _end which is wrong. Larger mtd rootfs
was rewritten by init_bootmem_node.
MMU kernel use static initialization where klimit
is setup to _end. There is no any other hanling
with klimit.
Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze')
-rw-r--r-- | arch/microblaze/mm/init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/microblaze/mm/init.c b/arch/microblaze/mm/init.c index 8d92c4efe9a4..f207f1a94dbc 100644 --- a/arch/microblaze/mm/init.c +++ b/arch/microblaze/mm/init.c | |||
@@ -130,13 +130,13 @@ void __init setup_memory(void) | |||
130 | * (in case the address isn't page-aligned). | 130 | * (in case the address isn't page-aligned). |
131 | */ | 131 | */ |
132 | #ifndef CONFIG_MMU | 132 | #ifndef CONFIG_MMU |
133 | map_size = init_bootmem_node(NODE_DATA(0), PFN_UP(TOPHYS((u32)_end)), | 133 | map_size = init_bootmem_node(NODE_DATA(0), PFN_UP(TOPHYS((u32)klimit)), |
134 | min_low_pfn, max_low_pfn); | 134 | min_low_pfn, max_low_pfn); |
135 | #else | 135 | #else |
136 | map_size = init_bootmem_node(&contig_page_data, | 136 | map_size = init_bootmem_node(&contig_page_data, |
137 | PFN_UP(TOPHYS((u32)_end)), min_low_pfn, max_low_pfn); | 137 | PFN_UP(TOPHYS((u32)klimit)), min_low_pfn, max_low_pfn); |
138 | #endif | 138 | #endif |
139 | lmb_reserve(PFN_UP(TOPHYS((u32)_end)) << PAGE_SHIFT, map_size); | 139 | lmb_reserve(PFN_UP(TOPHYS((u32)klimit)) << PAGE_SHIFT, map_size); |
140 | 140 | ||
141 | /* free bootmem is whole main memory */ | 141 | /* free bootmem is whole main memory */ |
142 | free_bootmem(memory_start, memory_size); | 142 | free_bootmem(memory_start, memory_size); |