From 5b1acae2b79c74fb8c7e5694945d22d45108bf08 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Sun, 18 Sep 2011 22:40:00 -0400 Subject: [PATCH] --- yaml --- r: 279879 b: refs/heads/master c: 55a8173cfe1c6b489f8f5705282c762aed2e265e h: refs/heads/master i: 279877: 8867e54125b8632fbde413e9cfa64be706a309a5 279875: 0b8495bb5d7b23bcc112d736dfd9e4dc4d1c37fa 279871: d2fcafad7996cf0b851bf410349cbc6e25bf8bce v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/init.c | 2 -- trunk/arch/arm/mm/mmu.c | 1 + trunk/arch/arm/mm/nommu.c | 2 ++ 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f111bb933710..b98393e0636c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 27a3f0e91bed0f4dcf0a363e5f5938126d1ff4e5 +refs/heads/master: 55a8173cfe1c6b489f8f5705282c762aed2e265e diff --git a/trunk/arch/arm/mm/init.c b/trunk/arch/arm/mm/init.c index d366051e14fe..786adddf1a86 100644 --- a/trunk/arch/arm/mm/init.c +++ b/trunk/arch/arm/mm/init.c @@ -381,8 +381,6 @@ void __init bootmem_init(void) */ arm_bootmem_free(min, max_low, max_high); - high_memory = __va(((phys_addr_t)max_low << PAGE_SHIFT) - 1) + 1; - /* * This doesn't seem to be used by the Linux memory manager any * more, but is used by ll_rw_block. If we can get rid of it, we diff --git a/trunk/arch/arm/mm/mmu.c b/trunk/arch/arm/mm/mmu.c index dc8c550e6cbd..0aa8b7d5b21d 100644 --- a/trunk/arch/arm/mm/mmu.c +++ b/trunk/arch/arm/mm/mmu.c @@ -860,6 +860,7 @@ void __init sanity_check_meminfo(void) } #endif meminfo.nr_banks = j; + high_memory = __va(lowmem_limit - 1) + 1; memblock_set_current_limit(lowmem_limit); } diff --git a/trunk/arch/arm/mm/nommu.c b/trunk/arch/arm/mm/nommu.c index 941a98c9e8aa..9348730a6ba5 100644 --- a/trunk/arch/arm/mm/nommu.c +++ b/trunk/arch/arm/mm/nommu.c @@ -29,6 +29,8 @@ void __init arm_mm_memblock_reserve(void) void __init sanity_check_meminfo(void) { + phys_addr_t end = bank_phys_end(&meminfo.bank[meminfo.nr_banks - 1]); + high_memory = __va(end - 1) + 1; } /*