mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
[PATCH] mm: use symbolic names instead of indices for zone initialisation
Arch-independent zone-sizing is using indices instead of symbolic names to offset within an array related to zones (max_zone_pfns). The unintended impact is that ZONE_DMA and ZONE_NORMAL is initialised on powerpc instead of ZONE_DMA and ZONE_HIGHMEM when CONFIG_HIGHMEM is set. As a result, the the machine fails to boot but will boot with CONFIG_HIGHMEM turned off. The following patch properly initialises the max_zone_pfns[] array and uses symbolic names instead of indices in each architecture using arch-independent zone-sizing. Two users have successfully booted their powerpcs with it (one an ibook G4). It has also been boot tested on x86, x86_64, ppc64 and ia64. Please merge for 2.6.19-rc2. Credit to Benjamin Herrenschmidt for identifying the bug and rolling the first fix. Additional credit to Johannes Berg and Andreas Schwab for reporting the problem and testing on powerpc. Signed-off-by: Mel Gorman <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
4e0fadfcf6
commit
6391af174a
9 changed files with 36 additions and 27 deletions
|
|
@ -374,11 +374,12 @@ void __init paging_init(void)
|
|||
end_pfn = start_pfn + (total_memory >> PAGE_SHIFT);
|
||||
add_active_range(0, start_pfn, end_pfn);
|
||||
|
||||
memset(max_zone_pfns, 0, sizeof(max_zone_pfns));
|
||||
#ifdef CONFIG_HIGHMEM
|
||||
max_zone_pfns[0] = total_lowmem >> PAGE_SHIFT;
|
||||
max_zone_pfns[1] = total_memory >> PAGE_SHIFT;
|
||||
max_zone_pfns[ZONE_DMA] = total_lowmem >> PAGE_SHIFT;
|
||||
max_zone_pfns[ZONE_HIGHMEM] = total_memory >> PAGE_SHIFT;
|
||||
#else
|
||||
max_zone_pfns[0] = total_memory >> PAGE_SHIFT;
|
||||
max_zone_pfns[ZONE_DMA] = total_memory >> PAGE_SHIFT;
|
||||
#endif /* CONFIG_HIGHMEM */
|
||||
free_area_init_nodes(max_zone_pfns);
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue