diff options
author | Russell King | 2012-01-05 14:24:33 +0100 |
---|---|---|
committer | Russell King | 2012-01-05 14:24:33 +0100 |
commit | 2e0e943436912ffe0848ece58167edfe754edb96 (patch) | |
tree | b91919095c74742fa06e2105db6d859bee39b2b4 /arch/arm/mm/nommu.c | |
parent | Merge branches 'fixes' and 'misc' into for-linus (diff) | |
parent | ARM: 7269/1: mach-sa1100: fix sched_clock breakage (diff) | |
download | kernel-qcow2-linux-2e0e943436912ffe0848ece58167edfe754edb96.tar.gz kernel-qcow2-linux-2e0e943436912ffe0848ece58167edfe754edb96.tar.xz kernel-qcow2-linux-2e0e943436912ffe0848ece58167edfe754edb96.zip |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-shmobile/board-kota2.c
Diffstat (limited to 'arch/arm/mm/nommu.c')
-rw-r--r-- | arch/arm/mm/nommu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c index 941a98c9e8aa..4fc6794cca4b 100644 --- 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; } /* @@ -43,7 +45,7 @@ void __init paging_init(struct machine_desc *mdesc) /* * We don't need to do anything here for nommu machines. */ -void setup_mm_for_reboot(char mode) +void setup_mm_for_reboot(void) { } |