diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2015-11-15 05:46:55 -0500 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2015-11-22 05:35:25 -0500 |
commit | b66f55cdba5559dedd295356bb5138c5ceadb694 (patch) | |
tree | cb11fab5ae087552d4aaf4f9602777247750f241 | |
parent | c73ec319339030a455e7641e7020fc14093a4153 (diff) |
m68knommu: Add missing initialization of max_pfn and {min,max}_low_pfn
If max_pfn is not initialized, the block layer may use wrong DMA masks.
Replace open-coded shifts by PFN_DOWN(), and drop the "0 on coldfire"
comment, as it is not even true on all Coldfires, let alone all
m68knommu platforms.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Tested-By: Greg Ungerer <gerg@uclinux.org>
-rw-r--r-- | arch/m68k/kernel/setup_no.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c index 88c27d94a721..76b9113f3092 100644 --- a/arch/m68k/kernel/setup_no.c +++ b/arch/m68k/kernel/setup_no.c | |||
@@ -238,11 +238,14 @@ void __init setup_arch(char **cmdline_p) | |||
238 | * Give all the memory to the bootmap allocator, tell it to put the | 238 | * Give all the memory to the bootmap allocator, tell it to put the |
239 | * boot mem_map at the start of memory. | 239 | * boot mem_map at the start of memory. |
240 | */ | 240 | */ |
241 | min_low_pfn = PFN_DOWN(memory_start); | ||
242 | max_pfn = max_low_pfn = PFN_DOWN(memory_end); | ||
243 | |||
241 | bootmap_size = init_bootmem_node( | 244 | bootmap_size = init_bootmem_node( |
242 | NODE_DATA(0), | 245 | NODE_DATA(0), |
243 | memory_start >> PAGE_SHIFT, /* map goes here */ | 246 | min_low_pfn, /* map goes here */ |
244 | PAGE_OFFSET >> PAGE_SHIFT, /* 0 on coldfire */ | 247 | PFN_DOWN(PAGE_OFFSET), |
245 | memory_end >> PAGE_SHIFT); | 248 | max_pfn); |
246 | /* | 249 | /* |
247 | * Free the usable memory, we have to make sure we do not free | 250 | * Free the usable memory, we have to make sure we do not free |
248 | * the bootmem bitmap so we then reserve it after freeing it :-) | 251 | * the bootmem bitmap so we then reserve it after freeing it :-) |