| Message ID | 1329329763-31508-8-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 8d44c9b5..83097ad 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -60,8 +60,8 @@ ENTRY(__hyp_stub_install_secondary) cmp r6, r7 beq 2f @ matches primary CPU boot mode? - orr r6, r6, #BOOT_CPU_MODE_MISMATCH - str r6, [r4, r5] + orr r7, r7, #BOOT_CPU_MODE_MISMATCH + str r7, [r4, r5] bx lr @ record what happened and give up @ otherwise ...
Don't clobber the initial stored boot cpu mode. Previously, the mode stored in __boot_cpu_mode would be the mode of the last booted CPU, not the first. The first is possibly more useful, so store that instead. Signed-off-by: Dave Martin <dave.martin@linaro.org> --- arch/arm/kernel/hyp-stub.S | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)