From d49cec598dc47133e8b6b9f7fff4061ceeb5603e Mon Sep 17 00:00:00 2001 From: Gleb Natapov Date: Fri, 14 Dec 2012 15:23:16 +0200 Subject: [PATCH] --- yaml --- r: 356794 b: refs/heads/master c: e11ae1a102b46f76441e328a2743ae5d6e201423 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/irq.c | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1d352f8c8658..2c21e1afea69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0f888f5acd0cd806d4fd9f4067276b3855a13309 +refs/heads/master: e11ae1a102b46f76441e328a2743ae5d6e201423 diff --git a/trunk/arch/x86/kvm/irq.c b/trunk/arch/x86/kvm/irq.c index ebd98d0c4f6e..b111aee815f8 100644 --- a/trunk/arch/x86/kvm/irq.c +++ b/trunk/arch/x86/kvm/irq.c @@ -43,8 +43,6 @@ EXPORT_SYMBOL(kvm_cpu_has_pending_timer); */ int kvm_cpu_has_interrupt(struct kvm_vcpu *v) { - struct kvm_pic *s; - if (!irqchip_in_kernel(v->kvm)) return v->arch.interrupt.pending; @@ -60,8 +58,6 @@ EXPORT_SYMBOL_GPL(kvm_cpu_has_interrupt); */ int kvm_cpu_get_interrupt(struct kvm_vcpu *v) { - struct kvm_pic *s; - if (!irqchip_in_kernel(v->kvm)) return v->arch.interrupt.nr;