---

yaml --- r: 201420 b: refs/heads/master c: 8594a0c h: refs/heads/master v: v3
git-mirror · Jul 9, 2010 · 01a7b35 · 01a7b35
1 parent a57f0a4
commit 01a7b35
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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