From 181670bf84c6ef8c66b062d317d526a81d519cb0 Mon Sep 17 00:00:00 2001 From: "Aneesh Kumar K.V" Date: Wed, 11 Oct 2006 01:20:43 -0700 Subject: [PATCH] --- yaml --- r: 39283 b: refs/heads/master c: c37e108d156101dcde7ec7033eabe7abe83366bc h: refs/heads/master i: 39281: ada11d4e8c6c3b730c5b478ee53262e4812327f7 39279: 51a8bb3e718eae2110b1543206029a91107225a4 v: v3 --- [refs] | 2 +- trunk/arch/i386/kernel/io_apic.c | 2 +- trunk/arch/x86_64/kernel/io_apic.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index aa16c39d3f9a..5b44ec3601f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1db11ea65eaf1e7f6a70805fe52bc0aef53f68ef +refs/heads/master: c37e108d156101dcde7ec7033eabe7abe83366bc diff --git a/trunk/arch/i386/kernel/io_apic.c b/trunk/arch/i386/kernel/io_apic.c index cd082c36ca03..27bceaf5ce40 100644 --- a/trunk/arch/i386/kernel/io_apic.c +++ b/trunk/arch/i386/kernel/io_apic.c @@ -2594,7 +2594,7 @@ static void set_ht_irq_affinity(unsigned int irq, cpumask_t mask) } #endif -static struct hw_interrupt_type ht_irq_chip = { +static struct irq_chip ht_irq_chip = { .name = "PCI-HT", .mask = mask_ht_irq, .unmask = unmask_ht_irq, diff --git a/trunk/arch/x86_64/kernel/io_apic.c b/trunk/arch/x86_64/kernel/io_apic.c index 771bcf77daf2..c3cdcab29688 100644 --- a/trunk/arch/x86_64/kernel/io_apic.c +++ b/trunk/arch/x86_64/kernel/io_apic.c @@ -1897,7 +1897,7 @@ static void set_ht_irq_affinity(unsigned int irq, cpumask_t mask) } #endif -static struct hw_interrupt_type ht_irq_chip = { +static struct irq_chip ht_irq_chip = { .name = "PCI-HT", .mask = mask_ht_irq, .unmask = unmask_ht_irq,