Эх сурвалжийг харах

ARM: zImage: the page table memory must be considered before relocation

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@linaro.org>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Tony Lindgren <tony@atomide.com>
Nicolas Pitre 14 жил өмнө
parent
commit
ea9df3b168

+ 2 - 1
arch/arm/boot/compressed/head.S

@@ -216,9 +216,10 @@ restart:	adr	r0, LC0
  *   r9  = size of decompressed image
  *   r9  = size of decompressed image
  *   r10 = end of this image, including  bss/stack/malloc space if non XIP
  *   r10 = end of this image, including  bss/stack/malloc space if non XIP
  * We basically want:
  * We basically want:
- *   r4 >= r10 -> OK
+ *   r4 - 16k page directory >= r10 -> OK
  *   r4 + image length <= current position (pc) -> OK
  *   r4 + image length <= current position (pc) -> OK
  */
  */
+		add	r10, r10, #16384
 		cmp	r4, r10
 		cmp	r4, r10
 		bhs	wont_overwrite
 		bhs	wont_overwrite
 		add	r10, r4, r9
 		add	r10, r4, r9