From: Russell King Date: Sat, 15 Jan 2011 11:19:19 +0000 (+0000) Subject: ARM: fix missing branch in __error_a X-Git-Tag: v3.0~2067^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cb4d3eaebb96616085f5a46a7d7e004ddd955b09;p=platform%2Fkernel%2Flinux-amlogic.git ARM: fix missing branch in __error_a When DEBUG_LL is not set, we don't want __error_a re-entering __lookup_machine_type - we want it to go to the error function. This used to be the case before we reorganized the layout for hotplug cpu, as we used to fall through to __error. With the changed layout, we need an explicit branch here instead. Signed-off-by: Russell King --- diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S index bbecaac..8f57515 100644 --- a/arch/arm/kernel/head-common.S +++ b/arch/arm/kernel/head-common.S @@ -60,6 +60,8 @@ str_a1: .asciz "\nError: unrecognized/unsupported machine ID (r1 = 0x" str_a2: .asciz ").\n\nAvailable machine support:\n\nID (hex)\tNAME\n" str_a3: .asciz "\nPlease check your kernel config and/or bootloader.\n" .align +#else + b __error #endif /*