From 20c6ad3431ecf1ca1604fba3ed452d39e34d821d Mon Sep 17 00:00:00 2001 From: Duan Jiong Date: Mon, 11 Apr 2011 12:56:01 +0800 Subject: [PATCH] --- yaml --- r: 248045 b: refs/heads/master c: 1e015968dfb9289934ad66a67fa38a93f0adf4f8 h: refs/heads/master i: 248043: cbcf5090f3f132b9a0817349042970e1b691c9fd v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/irq.h | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9b65911f4d53..2fd10924746d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b42fc3cbc3d6e284463e93896679379443e19d56 +refs/heads/master: 1e015968dfb9289934ad66a67fa38a93f0adf4f8 diff --git a/trunk/arch/x86/kvm/irq.h b/trunk/arch/x86/kvm/irq.h index ba910d149410..53e2d084bffb 100644 --- a/trunk/arch/x86/kvm/irq.h +++ b/trunk/arch/x86/kvm/irq.h @@ -75,7 +75,6 @@ struct kvm_pic *kvm_create_pic(struct kvm *kvm); void kvm_destroy_pic(struct kvm *kvm); int kvm_pic_read_irq(struct kvm *kvm); void kvm_pic_update_irq(struct kvm_pic *s); -void kvm_pic_clear_isr_ack(struct kvm *kvm); static inline struct kvm_pic *pic_irqchip(struct kvm *kvm) { @@ -100,7 +99,6 @@ void __kvm_migrate_apic_timer(struct kvm_vcpu *vcpu); void __kvm_migrate_pit_timer(struct kvm_vcpu *vcpu); void __kvm_migrate_timers(struct kvm_vcpu *vcpu); -int pit_has_pending_timer(struct kvm_vcpu *vcpu); int apic_has_pending_timer(struct kvm_vcpu *vcpu); #endif