diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-15 11:19:19 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-01-15 11:19:19 +0000 |
| commit | cb4d3eaebb96616085f5a46a7d7e004ddd955b09 (patch) | |
| tree | 68d53e993cdc1810762f0ff91c8891dc4090f86e /arch | |
| parent | d5996b2ff0e26cf7ed4c103084a2d6fc569e7216 (diff) | |
| download | linux-3.10-cb4d3eaebb96616085f5a46a7d7e004ddd955b09.tar.gz linux-3.10-cb4d3eaebb96616085f5a46a7d7e004ddd955b09.tar.bz2 linux-3.10-cb4d3eaebb96616085f5a46a7d7e004ddd955b09.zip | |
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 <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kernel/head-common.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/head-common.S b/arch/arm/kernel/head-common.S index bbecaac1e01..8f57515bbdb 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 /* |