From 8bf89a1553a9feb14aaa0175e2663c533c4fde21 Mon Sep 17 00:00:00 2001 From: Scott Wood Date: Thu, 30 Sep 2010 14:28:50 -0500 Subject: [PATCH] --- yaml --- r: 221652 b: refs/heads/master c: bb59e9748f9bc95212c7fe21468ba184938c48cb h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kvm/timing.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7a4c0f00a21d..61cfe4b27fcd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f22e2f049d4643ed3c2d498ca50f894ace87962b +refs/heads/master: bb59e9748f9bc95212c7fe21468ba184938c48cb diff --git a/trunk/arch/powerpc/kvm/timing.c b/trunk/arch/powerpc/kvm/timing.c index 46fa04f12a9b..a021f5827a33 100644 --- a/trunk/arch/powerpc/kvm/timing.c +++ b/trunk/arch/powerpc/kvm/timing.c @@ -35,7 +35,6 @@ void kvmppc_init_timing_stats(struct kvm_vcpu *vcpu) int i; /* pause guest execution to avoid concurrent updates */ - local_irq_disable(); mutex_lock(&vcpu->mutex); vcpu->arch.last_exit_type = 0xDEAD; @@ -51,7 +50,6 @@ void kvmppc_init_timing_stats(struct kvm_vcpu *vcpu) vcpu->arch.timing_last_enter.tv64 = 0; mutex_unlock(&vcpu->mutex); - local_irq_enable(); } static void add_exit_timing(struct kvm_vcpu *vcpu, u64 duration, int type)