ARM: 7614/1: mm: fix wrong branch from Cortex-A9 to PJ4b · d106de38ca - Gogs

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>

Haojian Zhuang 12 years ago

parent

a47e3bc10d

commit

d106de38ca

1 changed files with 1 additions and 0 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 0
						
arch/arm/mm/proc-v7.S
							 
								View File
							
				@@ -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