Merge branch 'vmalloc' of git://git.linaro.org/people/nico/linux into devel-stable

2011-12-05 23:27:54 +00:00
parent 742eaa6a6e 0af362f844
commit 73829af71f
96 changed files with 179 additions and 1406 deletions
--- a/arch/arm/mm/nommu.c
+++ b/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;
 }

 /*