From: Nicolas Pitre <nico@fluxnic.net>
Date: Sat, 7 Nov 2009 06:35:06 +0000 (+0100)
Subject: ARM: 5784/1: fix early boot machine ID mismatch error display
X-Git-Tag: 2.1b_release~10433^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=158bc5af3d49be49c33dc06ff90c4f754c7d4f1b;p=platform%2Fkernel%2Fkernel-mfld-blackbay.git

ARM: 5784/1: fix early boot machine ID mismatch error display

That code was refactored a long time ago, but one particular label
didn't get adjusted properly which broke the listing of supported
machines.

Signed-off-by: Nicolas Pitre <nico@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S
index 885a721..b9505aa 100644
--- a/arch/arm/kernel/head-common.S
+++ b/arch/arm/kernel/head-common.S
@@ -97,7 +97,7 @@ __error_a:
 	bl	printhex8
 	adr	r0, str_a2
 	bl	printascii
-	adr	r3, 3f
+	adr	r3, 4f
 	ldmia	r3, {r4, r5, r6}		@ get machine desc list
 	sub	r4, r3, r4			@ get offset between virt&phys
 	add	r5, r5, r4			@ convert virt addresses to