summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMika Westerberg <mika.westerberg@iki.fi>2010-05-10 09:24:53 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-07-09 15:00:52 +0100
commit8594a0c333dd79c45c3a24cac8029177728363e0 (patch)
tree23aaa34dc156c8e20b81f7411c7fb53e9d6151ff
parentc63836204b27faec5a22d4b53692690cb967aaac (diff)
ARM: 6119/1: kdump: skip indirection page when crashing
When we are crashing there is no indirection page in place. Only control page is present. Signed-off-by: Mika Westerberg <ext-mika.1.westerberg@nokia.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/kernel/relocate_kernel.S6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/kernel/relocate_kernel.S b/arch/arm/kernel/relocate_kernel.S
index 61930eb09029..fd26f8d65151 100644
--- a/arch/arm/kernel/relocate_kernel.S
+++ b/arch/arm/kernel/relocate_kernel.S
@@ -10,6 +10,12 @@ relocate_new_kernel:
ldr r0,kexec_indirection_page
ldr r1,kexec_start_address
+ /*
+ * If there is no indirection page (we are doing crashdumps)
+ * skip any relocation.
+ */
+ cmp r0, #0
+ beq 2f
0: /* top, read another word for the indirection page */
ldr r3, [r0],#4