Skip to content

Commit

Permalink
ARM: 7614/1: mm: fix wrong branch from Cortex-A9 to PJ4b
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
hzhuang1 authored and Russell King committed Jan 6, 2013
1 parent a47e3bc commit d106de3
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions arch/arm/mm/proc-v7.S
Expand Up @@ -169,6 +169,7 @@ __v7_ca15mp_setup:
orreq r0, r0, r10 @ Enable CPU-specific SMP bits
mcreq p15, 0, r0, c1, c0, 1
#endif
b __v7_setup

__v7_pj4b_setup:
#ifdef CONFIG_CPU_PJ4B
Expand Down

0 comments on commit d106de3

Please sign in to comment.