projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c742239)
ARM: 5784/1: fix early boot machine ID mismatch error display
authorNicolas Pitre <nico@fluxnic.net>
Sat, 7 Nov 2009 06:35:06 +0000 (07:35 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 8 Nov 2009 11:58:54 +0000 (11:58 +0000)
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>
arch/arm/kernel/head-common.S patch | blob | blame | history

diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S
index 885a7214418d81877d3cec0eb2f3c4d2f0d07133..b9505aa267c003a84b2101b1e66af809932f867e 100644 (file)
--- 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