summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/compressed
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2015-01-20 03:44:26 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-01-21 16:59:34 +0100
commit7d57909bf69f213b4a9f278d78271e7c9a05f62f (patch)
treed17c16a463aea6c37eab078d892352e5c1284c6a /arch/arm/boot/compressed
parentARM: 8286/1: mm: Fix dma_contiguous_reserve comment (diff)
downloadlinux-7d57909bf69f213b4a9f278d78271e7c9a05f62f.tar.xz
linux-7d57909bf69f213b4a9f278d78271e7c9a05f62f.zip
ARM: 8290/1: decompressor: fix a wrong comment
This comment does not correspond to the actual code. When zImage is loaded at a lower *OR* higher address of the destination of Image, it won't overwrite itself. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Acked-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/boot/compressed')
-rw-r--r--arch/arm/boot/compressed/head.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S
index 68be9017593d..9dff61479dff 100644
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
@@ -178,7 +178,7 @@ not_angel:
/*
* Set up a page table only if it won't overwrite ourself.
- * That means r4 < pc && r4 - 16k page directory > &_end.
+ * That means r4 < pc || r4 - 16k page directory > &_end.
* Given that r4 > &_end is most unfrequent, we add a rough
* additional 1MB of room for a possible appended DTB.
*/