ARM: fix missing branch in __error_a
authorRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 15 Jan 2011 11:19:19 +0000 (11:19 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 15 Jan 2011 11:19:19 +0000 (11:19 +0000)
commitcb4d3eaebb96616085f5a46a7d7e004ddd955b09
tree68d53e993cdc1810762f0ff91c8891dc4090f86e
parentd5996b2ff0e26cf7ed4c103084a2d6fc569e7216
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>
arch/arm/kernel/head-common.S