diff options
author | Ingo Molnar <mingo@kernel.org> | 2015-02-04 07:53:17 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2015-02-04 07:53:17 +0100 |
commit | 2622e849a1d3d3ef531d1cc33308bb7fd00eee40 (patch) | |
tree | f2be9d9f08444cb93b3a8f87099fe4ff8ac3cd57 /arch/arm/kvm/arm.c | |
parent | 996636ddae5cab8883bd76b996cd4f2ea9a152be (diff) | |
parent | e36f014edff70fc02b3d3d79cead1d58f289332e (diff) | |
download | kernel_replicant_linux-2622e849a1d3d3ef531d1cc33308bb7fd00eee40.tar.gz kernel_replicant_linux-2622e849a1d3d3ef531d1cc33308bb7fd00eee40.tar.bz2 kernel_replicant_linux-2622e849a1d3d3ef531d1cc33308bb7fd00eee40.zip |
Merge tag 'v3.19-rc7' into locking/core, to refresh the branch before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/kvm/arm.c')
-rw-r--r-- | arch/arm/kvm/arm.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c index 2d6d91001062..0b0d58a905c4 100644 --- a/arch/arm/kvm/arm.c +++ b/arch/arm/kvm/arm.c @@ -281,15 +281,6 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) vcpu->cpu = cpu; vcpu->arch.host_cpu_context = this_cpu_ptr(kvm_host_cpu_state); - /* - * Check whether this vcpu requires the cache to be flushed on - * this physical CPU. This is a consequence of doing dcache - * operations by set/way on this vcpu. We do it here to be in - * a non-preemptible section. - */ - if (cpumask_test_and_clear_cpu(cpu, &vcpu->arch.require_dcache_flush)) - flush_cache_all(); /* We'd really want v7_flush_dcache_all() */ - kvm_arm_set_running_vcpu(vcpu); } @@ -541,7 +532,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *run) ret = kvm_call_hyp(__kvm_vcpu_run, vcpu); vcpu->mode = OUTSIDE_GUEST_MODE; - vcpu->arch.last_pcpu = smp_processor_id(); kvm_guest_exit(); trace_kvm_exit(*vcpu_pc(vcpu)); /* |