| Message ID | 1329329763-31508-6-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 5c5f49f..15d556d 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -87,9 +87,7 @@ ENTRY(__hyp_stub_install_secondary) adr r4, 1f ldr r5, .L__boot_cpu_mode_offset -1: ldr r7, [r4, r5] - add r7, r7, #1 - str r7, [r4, r5] @ increment __hyp_stub_install_count +1: str r6, [r4, r5] @ Store the boot mode bic lr, lr, #1 @ clear thumb bit @ (SPSR.T used instead)
Instead of counting how many CPUs the hypervisor stub was installed on, we simply record what mode the primary CPU was booted and set a flag if an inconsistency is detected. REALLY, this time Signed-off-by: Dave Martin <dave.martin@linaro.org> --- arch/arm/kernel/hyp-stub.S | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)