diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-11-11 11:56:07 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-11-11 12:02:27 +0100 |
| commit | 6da8ae556c11bb3b832dcc0bd077c2d563f5583f (patch) | |
| tree | a66ef36fe683e8d2c7507cbf62d18e0a6f175193 /arch/arm64 | |
| parent | kvm, cpuid: Fix sparse warning (diff) | |
| parent | arm/arm64: KVM: PSCI: use MPIDR to identify a target CPU (diff) | |
| download | linux-6da8ae556c11bb3b832dcc0bd077c2d563f5583f.tar.xz linux-6da8ae556c11bb3b832dcc0bd077c2d563f5583f.zip | |
Merge tag 'kvm-arm-for-3.13-3' of git://git.linaro.org/people/cdall/linux-kvm-arm into kvm-next
Updates for KVM/ARM, take 3 supporting more than 4 CPUs.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Conflicts:
arch/arm/kvm/reset.c [cpu_reset->reset_regs change; context only]
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/include/asm/kvm_emulate.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h index eec073875218..6df93cdc652b 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -177,4 +177,9 @@ static inline u8 kvm_vcpu_trap_get_fault(const struct kvm_vcpu *vcpu) return kvm_vcpu_get_hsr(vcpu) & ESR_EL2_FSC_TYPE; } +static inline unsigned long kvm_vcpu_get_mpidr(struct kvm_vcpu *vcpu) +{ + return vcpu_sys_reg(vcpu, MPIDR_EL1); +} + #endif /* __ARM64_KVM_EMULATE_H__ */ |