diff options
| author | Xiantao Zhang <xiantao.zhang@intel.com> | 2008-09-27 11:46:36 +0800 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2008-10-15 14:25:36 +0200 |
| commit | 2f7497719179a9f3270b05434be989d21f9fdc09 (patch) | |
| tree | 1fd56153b634b50af4c24253a103bb31823025b9 | |
| parent | 3de42dc094ecd313dc7d551e007a134b52f8663d (diff) | |
| download | linux-2f7497719179a9f3270b05434be989d21f9fdc09.tar.gz linux-2f7497719179a9f3270b05434be989d21f9fdc09.tar.bz2 linux-2f7497719179a9f3270b05434be989d21f9fdc09.zip | |
KVM: Move irqchip_in_kernel() from ioapic.h to irq.h
Moving irqchip_in_kernel() from ioapic.h to irq.h.
Signed-off-by: Xiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
| -rw-r--r-- | arch/ia64/kvm/irq.h | 4 | ||||
| -rw-r--r-- | arch/ia64/kvm/kvm-ia64.c | 1 | ||||
| -rw-r--r-- | virt/kvm/ioapic.h | 7 |
3 files changed, 5 insertions, 7 deletions
diff --git a/arch/ia64/kvm/irq.h b/arch/ia64/kvm/irq.h index 604329ac3c99..c6786e8b1bf4 100644 --- a/arch/ia64/kvm/irq.h +++ b/arch/ia64/kvm/irq.h @@ -23,5 +23,9 @@ #ifndef __IRQ_H #define __IRQ_H +static inline int irqchip_in_kernel(struct kvm *kvm) +{ + return 1; +} #endif diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 7ad759e34295..a6cf719811b7 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c @@ -45,6 +45,7 @@ #include "iodev.h" #include "ioapic.h" #include "lapic.h" +#include "irq.h" static unsigned long kvm_vmm_base; static unsigned long kvm_vsa_base; diff --git a/virt/kvm/ioapic.h b/virt/kvm/ioapic.h index b52732f493c1..cd7ae7691c9d 100644 --- a/virt/kvm/ioapic.h +++ b/virt/kvm/ioapic.h @@ -79,13 +79,6 @@ static inline struct kvm_ioapic *ioapic_irqchip(struct kvm *kvm) return kvm->arch.vioapic; } -#ifdef CONFIG_IA64 -static inline int irqchip_in_kernel(struct kvm *kvm) -{ - return 1; -} -#endif - struct kvm_vcpu *kvm_get_lowest_prio_vcpu(struct kvm *kvm, u8 vector, unsigned long bitmap); void kvm_ioapic_update_eoi(struct kvm *kvm, int vector, int trigger_mode); |