ARM: 7614/1: mm: fix wrong branch from Cortex-A9 to PJ4b
authorHaojian Zhuang <haojian.zhuang@linaro.org>
Sat, 5 Jan 2013 12:57:38 +0000 (13:57 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 6 Jan 2013 17:54:08 +0000 (17:54 +0000)
commitd106de38ca927f2a53cd56ef94c506e8f6bd37e1
treeca44d4eda03c584274a810327af73391c31ed3b4
parenta47e3bc10d0e34a67e10a9f8150a144af654be2a
ARM: 7614/1: mm: fix wrong branch from Cortex-A9 to PJ4b

If CONFIG_ARCH_MULTIPLATFORM & CONFIG_ARCH_MVEBU are both enabled,
__v7_pj4b_setup is added between __v7_ca9mp_setup and __v7_setup.

But there's no jump instruction added. If the chip is Cortex A5/A9,
it goes through __v7_pj4b_setup also. It results in system hang.

Signed-off-by: Haojian Zhuang <haojian.zhuang@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/mm/proc-v7.S