diff options
| author | Alexander Graf <agraf@suse.de> | 2013-04-25 13:50:03 +0400 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-04-26 22:27:27 +0400 |
| commit | 22e64024fb83065664160d1c28a10aa98cb5f24c (patch) | |
| tree | b0904bda314c34d085aaf0db80ca740449fc5852 /arch/ia64/kvm | |
| parent | 447a03c02adc57933d328eb15aeae33160bc92e8 (diff) | |
| download | linux-22e64024fb83065664160d1c28a10aa98cb5f24c.tar.xz | |
KVM: IA64: Carry non-ia64 changes into ia64
We changed a few things in non-ia64 code paths. This patch blindly applies
the changes to the ia64 code as well, hoping it proves useful in case anyone
revives the ia64 kvm code.
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'arch/ia64/kvm')
| -rw-r--r-- | arch/ia64/kvm/Kconfig | 1 | ||||
| -rw-r--r-- | arch/ia64/kvm/Makefile | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/kvm/Kconfig b/arch/ia64/kvm/Kconfig index 2cd225f8c68d..043183a06409 100644 --- a/arch/ia64/kvm/Kconfig +++ b/arch/ia64/kvm/Kconfig @@ -27,6 +27,7 @@ config KVM select PREEMPT_NOTIFIERS select ANON_INODES select HAVE_KVM_IRQCHIP + select HAVE_KVM_IRQ_ROUTING select KVM_APIC_ARCHITECTURE select KVM_MMIO ---help--- diff --git a/arch/ia64/kvm/Makefile b/arch/ia64/kvm/Makefile index db3d7c5d1071..511f64a78d56 100644 --- a/arch/ia64/kvm/Makefile +++ b/arch/ia64/kvm/Makefile @@ -49,7 +49,7 @@ ccflags-y := -Ivirt/kvm -Iarch/ia64/kvm/ asflags-y := -Ivirt/kvm -Iarch/ia64/kvm/ common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \ - coalesced_mmio.o irq_comm.o assigned-dev.o) + coalesced_mmio.o irq_comm.o assigned-dev.o irqchip.o) ifeq ($(CONFIG_IOMMU_API),y) common-objs += $(addprefix ../../../virt/kvm/, iommu.o) |