Merge remote-tracking branch 'origin/next' into kvm-ppc-next

[cascardo/linux.git] / arch / powerpc / kvm / powerpc.c

diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index ae63ae4..f55e14c 100644 (file)
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -117,8 +117,6 @@ int kvmppc_prepare_to_enter(struct kvm_vcpu *vcpu)
                        kvm_guest_exit();
                        continue;
                }
-
-               trace_hardirqs_on();
 #endif
 
                kvm_guest_enter();