[PATCH 4/9] ARM: zImage: the page table memory must be considered before relocation
Nicolas Pitre
nico at fluxnic.net
Thu Apr 28 18:50:19 EDT 2011
From: Nicolas Pitre <nicolas.pitre at linaro.org>
For correctness, the initial page table located right before the
decompressed kernel should be considered when determining if relocation
is required.
Signed-off-by: Nicolas Pitre <nicolas.pitre at linaro.org>
Tested-by: Shawn Guo <shawn.guo at linaro.org>
---
arch/arm/boot/compressed/head.S | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 6dae179..4c50490 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -216,9 +216,10 @@ restart: adr r0, LC0
* r9 = size of decompressed image
* r10 = end of this image, including bss/stack/malloc space if non XIP
* We basically want:
- * r4 >= r10 -> OK
+ * r4 - 16k page directory >= r10 -> OK
* r4 + image length <= current position (pc) -> OK
*/
+ add r10, r10, #16384
cmp r4, r10
bhs wont_overwrite
add r10, r4, r9
--
1.7.4
More information about the linux-arm-kernel
mailing list