Merge tag 'iwlwifi-next-for-kalle-2014-12-30' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / arm / kvm / guest.c

diff --git a/arch/arm/kvm/guest.c b/arch/arm/kvm/guest.c
index 813e492..384bab6 100644 (file)
--- a/arch/arm/kvm/guest.c
+++ b/arch/arm/kvm/guest.c
@@ -38,7 +38,6 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
 
 int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
 {
-       vcpu->arch.hcr = HCR_GUEST_MASK;
        return 0;
 }
 
@@ -163,7 +162,7 @@ static int set_timer_reg(struct kvm_vcpu *vcpu, const struct kvm_one_reg *reg)
 
        ret = copy_from_user(&val, uaddr, KVM_REG_SIZE(reg->id));
        if (ret != 0)
-               return ret;
+               return -EFAULT;
 
        return kvm_arm_timer_set_reg(vcpu, reg->id, val);
 }
@@ -274,31 +273,6 @@ int __attribute_const__ kvm_target_cpu(void)
        }
 }
 
-int kvm_vcpu_set_target(struct kvm_vcpu *vcpu,
-                       const struct kvm_vcpu_init *init)
-{
-       unsigned int i;
-
-       /* We can only cope with guest==host and only on A15/A7 (for now). */
-       if (init->target != kvm_target_cpu())
-               return -EINVAL;
-
-       vcpu->arch.target = init->target;
-       bitmap_zero(vcpu->arch.features, KVM_VCPU_MAX_FEATURES);
-
-       /* -ENOENT for unknown features, -EINVAL for invalid combinations. */
-       for (i = 0; i < sizeof(init->features) * 8; i++) {
-               if (test_bit(i, (void *)init->features)) {
-                       if (i >= KVM_VCPU_MAX_FEATURES)
-                               return -ENOENT;
-                       set_bit(i, vcpu->arch.features);
-               }
-       }
-
-       /* Now we know what it is, we can reset it. */
-       return kvm_reset_vcpu(vcpu);
-}
-
 int kvm_vcpu_preferred_target(struct kvm_vcpu_init *init)
 {
        int target = kvm_target_cpu();