---

yaml --- r: 279879 b: refs/heads/master c: 55a8173 h: refs/heads/master i: 279877: 8867e54 279875: 0b8495b 279871: d2fcafa v: v3
git-mirror · Nov 18, 2011 · 5b1acae · 5b1acae
1 parent e5f9384
commit 5b1acae
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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;
 }
 
 /*
-Original file line number
+Diff line change
@@ Expand Up / @@ -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);
     }
@@ Expand Down @@