aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm64/include
diff options
context:
space:
mode:
authorGleb Natapov <gleb@redhat.com>2013-10-16 15:30:32 +0300
committerGleb Natapov <gleb@redhat.com>2013-10-16 15:30:32 +0300
commitd570142674890fe10b3d7d86aa105e3dfce1ddfa (patch)
tree8a681c3cd9e21400773e24b32f8849d0f25cf4e7 /arch/arm64/include
parentKVM: Drop FOLL_GET in GUP when doing async page fault (diff)
parentKVM: ARM: Remove non-ASCII space characters (diff)
downloadlinux-dev-d570142674890fe10b3d7d86aa105e3dfce1ddfa.tar.xz
linux-dev-d570142674890fe10b3d7d86aa105e3dfce1ddfa.zip
Merge tag 'kvm-arm-for-3.13-1' of git://git.linaro.org/people/cdall/linux-kvm-arm into next
Updates for KVM/ARM including cpu=host and Cortex-A7 support
Diffstat (limited to 'arch/arm64/include')
-rw-r--r--arch/arm64/include/asm/kvm_host.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/kvm_host.h b/arch/arm64/include/asm/kvm_host.h
index 54c064f622aa..5d85a02d1231 100644
--- a/arch/arm64/include/asm/kvm_host.h
+++ b/arch/arm64/include/asm/kvm_host.h
@@ -146,6 +146,7 @@ struct kvm_vcpu_stat {
struct kvm_vcpu_init;
int kvm_vcpu_set_target(struct kvm_vcpu *vcpu,
const struct kvm_vcpu_init *init);
+int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init);
unsigned long kvm_arm_num_regs(struct kvm_vcpu *vcpu);
int kvm_arm_copy_reg_indices(struct kvm_vcpu *vcpu, u64 __user *indices);
struct kvm_one_reg;