aboutsummaryrefslogtreecommitdiffstats
path: root/virt/kvm
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-11-19 10:22:52 -0500
committerPaolo Bonzini <pbonzini@redhat.com>2014-11-20 05:08:33 -0500
commit003f7de6258900e17f6206e8e417d76c75ca549f (patch)
tree9de696cc63351a718db6472c270d2da158c20949 /virt/kvm
parent86619e7ba3991309b88969f9a2e5c7f2d014c680 (diff)
KVM: ia64: remove
KVM for ia64 has been marked as broken not just once, but twice even, and the last patch from the maintainer is now roughly 5 years old. Time for it to rest in peace. Acked-by: Gleb Natapov <gleb@kernel.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'virt/kvm')
-rw-r--r--virt/kvm/ioapic.c5
-rw-r--r--virt/kvm/ioapic.h1
-rw-r--r--virt/kvm/irq_comm.c22
3 files changed, 0 insertions, 28 deletions
diff --git a/virt/kvm/ioapic.c b/virt/kvm/ioapic.c
index 0ba4057d271b..f0f7ef82b7a6 100644
--- a/virt/kvm/ioapic.c
+++ b/virt/kvm/ioapic.c
@@ -586,11 +586,6 @@ static int ioapic_mmio_write(struct kvm_io_device *this, gpa_t addr, int len,
586 case IOAPIC_REG_WINDOW: 586 case IOAPIC_REG_WINDOW:
587 ioapic_write_indirect(ioapic, data); 587 ioapic_write_indirect(ioapic, data);
588 break; 588 break;
589#ifdef CONFIG_IA64
590 case IOAPIC_REG_EOI:
591 __kvm_ioapic_update_eoi(NULL, ioapic, data, IOAPIC_LEVEL_TRIG);
592 break;
593#endif
594 589
595 default: 590 default:
596 break; 591 break;
diff --git a/virt/kvm/ioapic.h b/virt/kvm/ioapic.h
index 31725a3a93b8..dc3baa3a538f 100644
--- a/virt/kvm/ioapic.h
+++ b/virt/kvm/ioapic.h
@@ -19,7 +19,6 @@ struct kvm_vcpu;
19/* Direct registers. */ 19/* Direct registers. */
20#define IOAPIC_REG_SELECT 0x00 20#define IOAPIC_REG_SELECT 0x00
21#define IOAPIC_REG_WINDOW 0x10 21#define IOAPIC_REG_WINDOW 0x10
22#define IOAPIC_REG_EOI 0x40 /* IA64 IOSAPIC only */
23 22
24/* Indirect registers. */ 23/* Indirect registers. */
25#define IOAPIC_REG_APIC_ID 0x00 /* x86 IOAPIC only */ 24#define IOAPIC_REG_APIC_ID 0x00 /* x86 IOAPIC only */
diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c
index 963b8995a9e8..1345bde064f5 100644
--- a/virt/kvm/irq_comm.c
+++ b/virt/kvm/irq_comm.c
@@ -26,9 +26,6 @@
26#include <trace/events/kvm.h> 26#include <trace/events/kvm.h>
27 27
28#include <asm/msidef.h> 28#include <asm/msidef.h>
29#ifdef CONFIG_IA64
30#include <asm/iosapic.h>
31#endif
32 29
33#include "irq.h" 30#include "irq.h"
34 31
@@ -57,12 +54,7 @@ static int kvm_set_ioapic_irq(struct kvm_kernel_irq_routing_entry *e,
57 54
58inline static bool kvm_is_dm_lowest_prio(struct kvm_lapic_irq *irq) 55inline static bool kvm_is_dm_lowest_prio(struct kvm_lapic_irq *irq)
59{ 56{
60#ifdef CONFIG_IA64
61 return irq->delivery_mode ==
62 (IOSAPIC_LOWEST_PRIORITY << IOSAPIC_DELIVERY_SHIFT);
63#else
64 return irq->delivery_mode == APIC_DM_LOWEST; 57 return irq->delivery_mode == APIC_DM_LOWEST;
65#endif
66} 58}
67 59
68int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src, 60int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,
@@ -346,20 +338,6 @@ static const struct kvm_irq_routing_entry default_routing[] = {
346 ROUTING_ENTRY1(18), ROUTING_ENTRY1(19), 338 ROUTING_ENTRY1(18), ROUTING_ENTRY1(19),
347 ROUTING_ENTRY1(20), ROUTING_ENTRY1(21), 339 ROUTING_ENTRY1(20), ROUTING_ENTRY1(21),
348 ROUTING_ENTRY1(22), ROUTING_ENTRY1(23), 340 ROUTING_ENTRY1(22), ROUTING_ENTRY1(23),
349#ifdef CONFIG_IA64
350 ROUTING_ENTRY1(24), ROUTING_ENTRY1(25),
351 ROUTING_ENTRY1(26), ROUTING_ENTRY1(27),
352 ROUTING_ENTRY1(28), ROUTING_ENTRY1(29),
353 ROUTING_ENTRY1(30), ROUTING_ENTRY1(31),
354 ROUTING_ENTRY1(32), ROUTING_ENTRY1(33),
355 ROUTING_ENTRY1(34), ROUTING_ENTRY1(35),
356 ROUTING_ENTRY1(36), ROUTING_ENTRY1(37),
357 ROUTING_ENTRY1(38), ROUTING_ENTRY1(39),
358 ROUTING_ENTRY1(40), ROUTING_ENTRY1(41),
359 ROUTING_ENTRY1(42), ROUTING_ENTRY1(43),
360 ROUTING_ENTRY1(44), ROUTING_ENTRY1(45),
361 ROUTING_ENTRY1(46), ROUTING_ENTRY1(47),
362#endif
363}; 341};
364 342
365int kvm_setup_default_irq_routing(struct kvm *kvm) 343int kvm_setup_default_irq_routing(struct kvm *kvm)