>From d8e586869041110bb43f05d7cce722240fa3abda Mon Sep 17 00:00:00 2001
From: Xiantao Zhang <xiantao.zhang@xxxxxxxxx>
Date: Sat, 27 Sep 2008 11:46:36 +0800
Subject: [PATCH] kvm: Moving 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@xxxxxxxxx>
---
arch/ia64/kvm/irq.h | 4 ++++
arch/ia64/kvm/kvm-ia64.c | 1 +
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 604329a..c6786e8 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 7ad759e..a6cf719 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 b52732f..cd7ae76 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);
--
1.5.1
Attachment:
0005-kvm-Moving-irqchip_in_kernel-from-ioapic.h-to-irq.h.patch
Description: 0005-kvm-Moving-irqchip_in_kernel-from-ioapic.h-to-irq.h.patch
