Commit fb4fe87d authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Russell King
Browse files

ARM: 6825/1: kernel/sleep.S: fix Thumb2 compilation issues 



Signed-off-by: default avatarNicolas Pitre <nicolas.pitre@linaro.org>
Reviewed-by: default avatarDave Martin <dave.martin@linaro.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 0efc48ec

arch/arm/kernel/sleep.S

+11 −3
Original line number Diff line number Diff line
@@ -119,11 +119,19 @@ ENTRY(cpu_resume) 
#else

	ldr	r0, sleep_save_sp	@ stack phys addr

#endif

	msr	cpsr_c, #PSR_I_BIT | PSR_F_BIT | SVC_MODE @ set SVC, irqs off

	setmode	PSR_I_BIT | PSR_F_BIT | SVC_MODE, r1  @ set SVC, irqs off

#ifdef MULTI_CPU

	ldmia	r0!, {r1, sp, lr, pc}	@ load v:p, stack, return fn, resume fn

	@ load v:p, stack, return fn, resume fn

  ARM(	ldmia	r0!, {r1, sp, lr, pc}	)

THUMB(	ldmia	r0!, {r1, r2, r3, r4}	)

THUMB(	mov	sp, r2			)

THUMB(	mov	lr, r3			)

THUMB(	bx	r4			)

#else

	ldmia	r0!, {r1, sp, lr}	@ load v:p, stack, return fn

	@ load v:p, stack, return fn

  ARM(	ldmia	r0!, {r1, sp, lr}	)

THUMB(	ldmia	r0!, {r1, r2, lr}	)

THUMB(	mov	sp, r2			)

	b	cpu_do_resume

#endif

ENDPROC(cpu_resume)