aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/init.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mm/init.c')
-rw-r--r--arch/arm/mm/init.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 8aab24f35a5e..d50533c2b409 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -426,12 +426,10 @@ void __init bootmem_init(void)
426 * This doesn't seem to be used by the Linux memory manager any 426 * This doesn't seem to be used by the Linux memory manager any
427 * more, but is used by ll_rw_block. If we can get rid of it, we 427 * more, but is used by ll_rw_block. If we can get rid of it, we
428 * also get rid of some of the stuff above as well. 428 * also get rid of some of the stuff above as well.
429 *
430 * Note: max_low_pfn and max_pfn reflect the number of _pages_ in
431 * the system, not the maximum PFN.
432 */ 429 */
433 max_low_pfn = max_low - PHYS_PFN_OFFSET; 430 min_low_pfn = min;
434 max_pfn = max_high - PHYS_PFN_OFFSET; 431 max_low_pfn = max_low;
432 max_pfn = max_high;
435} 433}
436 434
437/* 435/*
@@ -537,7 +535,7 @@ static inline void free_area_high(unsigned long pfn, unsigned long end)
537static void __init free_highpages(void) 535static void __init free_highpages(void)
538{ 536{
539#ifdef CONFIG_HIGHMEM 537#ifdef CONFIG_HIGHMEM
540 unsigned long max_low = max_low_pfn + PHYS_PFN_OFFSET; 538 unsigned long max_low = max_low_pfn;
541 struct memblock_region *mem, *res; 539 struct memblock_region *mem, *res;
542 540
543 /* set highmem page free */ 541 /* set highmem page free */