From 01a7b358262a58e9f579c672fdfbdb22689525b1 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@iki.fi>
Date: Mon, 10 May 2010 09:24:53 +0100
Subject: [PATCH] --- yaml --- r: 201420 b: refs/heads/master c:
 8594a0c333dd79c45c3a24cac8029177728363e0 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/kernel/relocate_kernel.S | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 056319331f9a..a5dd576bfa19 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c63836204b27faec5a22d4b53692690cb967aaac
+refs/heads/master: 8594a0c333dd79c45c3a24cac8029177728363e0
diff --git a/trunk/arch/arm/kernel/relocate_kernel.S b/trunk/arch/arm/kernel/relocate_kernel.S
index 61930eb09029..fd26f8d65151 100644
--- a/trunk/arch/arm/kernel/relocate_kernel.S
+++ b/trunk/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