| Message ID | 1329329763-31508-7-git-send-email-dave.martin@linaro.org |
|---|---|
| State | Not Applicable |
| Headers | show |
diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index 15d556d..8d44c9b5 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -88,14 +88,10 @@ ENTRY(__hyp_stub_install_secondary) adr r4, 1f ldr r5, .L__boot_cpu_mode_offset 1: str r6, [r4, r5] @ Store the boot mode - - bic lr, lr, #1 @ clear thumb bit - @ (SPSR.T used instead) - msr elr_hyp, lr bic r7, r6, #MODE_MASK orr r7, r7, #SVC_MODE msr spsr_cxsf, r7 - + msr elr_hyp, lr eret @ return, switching to SVC mode ENDPROC(__hyp_stub_install_secondary)
Remove needless fudging of the Thumb bit in ELF_hyp. It would be totally insane if the architecture did not allow this but to be set (though this probably needs checking) Signed-off-by: Dave Martin <dave.martin@linaro.org> --- arch/arm/kernel/hyp-stub.S | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-)