diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-08-12 09:43:45 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-08-12 09:43:45 +0200 |
| commit | cada23f308e3869ceb5c75f164d249448dfaec07 (patch) | |
| tree | 97c7aebcad0eb2a93a7519251a01f5be9255ee75 /arch/arm/kernel/hyp-stub.S | |
| parent | e769ece3b129698d2b09811a6f6d304e4eaa8c29 (diff) | |
| parent | 6c8c0c4dc0e98ee2191211d66e9f876e95787073 (diff) | |
Merge branch 'kvm-arm64/fixes-3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into kvm-master
Diffstat (limited to 'arch/arm/kernel/hyp-stub.S')
| -rw-r--r-- | arch/arm/kernel/hyp-stub.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/kernel/hyp-stub.S b/arch/arm/kernel/hyp-stub.S index 4910232c4833..797b1a6a4906 100644 --- a/arch/arm/kernel/hyp-stub.S +++ b/arch/arm/kernel/hyp-stub.S @@ -56,8 +56,8 @@ ENTRY(__boot_cpu_mode) ldr \reg3, [\reg2] ldr \reg1, [\reg2, \reg3] cmp \mode, \reg1 @ matches primary CPU boot mode? - orrne r7, r7, #BOOT_CPU_MODE_MISMATCH - strne r7, [r5, r6] @ record what happened and give up + orrne \reg1, \reg1, #BOOT_CPU_MODE_MISMATCH + strne \reg1, [\reg2, \reg3] @ record what happened and give up .endm #else /* ZIMAGE */ |