Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f749771 authored by Xiantao Zhang's avatar Xiantao Zhang Committed by Avi Kivity
Browse files

KVM: Move irqchip_in_kernel() from ioapic.h to irq.h 



Moving irqchip_in_kernel() from ioapic.h to irq.h.

Signed-off-by: default avatarXiantao Zhang <xiantao.zhang@intel.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 3de42dc0

arch/ia64/kvm/irq.h

+4 −0
Original line number Diff line number Diff line
@@ -23,5 +23,9 @@ 
#ifndef __IRQ_H

#define __IRQ_H



static inline int irqchip_in_kernel(struct kvm *kvm)

{

	return 1;

}



#endif

arch/ia64/kvm/kvm-ia64.c

+1 −0
Original line number Diff line number Diff line
@@ -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;

virt/kvm/ioapic.h

+0 −7
Original line number Diff line number Diff line
@@ -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);