aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic/io_apic.c
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2014-07-31 02:53:43 -0400
committerH. Peter Anvin <hpa@zytor.com>2014-07-31 11:05:43 -0400
commite76661ba09353efd04e3435ac15bb9444f5cf1fa (patch)
treea17803fb2ce2ae1aa05663455eedda7c52a75c04 /arch/x86/kernel/apic/io_apic.c
parent4c59f3e63d5a0673af8abbce64467a6b497c94d2 (diff)
x86, apic: Remove multi_timer_check callback
Since commit b5660ba76b41 ("x86, platforms: Remove NUMAQ") removed NUMAQ, the multi_timer_check() apic callback has been obsolete. Remove it. Signed-off-by: David Rientjes <rientjes@google.com> Link: http://lkml.kernel.org/r/alpine.DEB.2.02.1407302351120.17503@chino.kir.corp.google.com Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/apic/io_apic.c')
-rw-r--r--arch/x86/kernel/apic/io_apic.c16
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index a44dce8cc559..29290f554e79 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -3882,14 +3882,6 @@ int mp_irqdomain_map(struct irq_domain *domain, unsigned int virq,
3882 struct mp_pin_info *info = mp_pin_info(ioapic, hwirq); 3882 struct mp_pin_info *info = mp_pin_info(ioapic, hwirq);
3883 struct io_apic_irq_attr attr; 3883 struct io_apic_irq_attr attr;
3884 3884
3885 /*
3886 * Skip the timer IRQ if there's a quirk handler installed and if it
3887 * returns 1:
3888 */
3889 if (apic->multi_timer_check &&
3890 apic->multi_timer_check(ioapic, virq))
3891 return 0;
3892
3893 /* Get default attribute if not set by caller yet */ 3885 /* Get default attribute if not set by caller yet */
3894 if (!info->set) { 3886 if (!info->set) {
3895 u32 gsi = mp_pin_to_gsi(ioapic, hwirq); 3887 u32 gsi = mp_pin_to_gsi(ioapic, hwirq);
@@ -3919,14 +3911,6 @@ void mp_irqdomain_unmap(struct irq_domain *domain, unsigned int virq)
3919 int ioapic = (int)(long)domain->host_data; 3911 int ioapic = (int)(long)domain->host_data;
3920 int pin = (int)data->hwirq; 3912 int pin = (int)data->hwirq;
3921 3913
3922 /*
3923 * Skip the timer IRQ if there's a quirk handler installed and if it
3924 * returns 1:
3925 */
3926 if (apic->multi_timer_check &&
3927 apic->multi_timer_check(ioapic, virq))
3928 return;
3929
3930 ioapic_mask_entry(ioapic, pin); 3914 ioapic_mask_entry(ioapic, pin);
3931 __remove_pin_from_irq(cfg, ioapic, pin); 3915 __remove_pin_from_irq(cfg, ioapic, pin);
3932 WARN_ON(cfg->irq_2_pin != NULL); 3916 WARN_ON(cfg->irq_2_pin != NULL);