From: Mika Westerberg <mika.westerberg@iki.fi>
Date: Mon, 10 May 2010 08:24:53 +0000 (+0100)
Subject: ARM: 6119/1: kdump: skip indirection page when crashing
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=8594a0c333dd79c45c3a24cac8029177728363e0;p=mv-sheeva.git

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>
---

diff --git a/arch/arm/kernel/relocate_kernel.S b/arch/arm/kernel/relocate_kernel.S
index 61930eb0902..fd26f8d6515 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