diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-09-28 10:46:51 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-10-12 10:53:34 -0400 |
commit | 1c9db52534a2c0e9776788cd34ccc193289fc18c (patch) | |
tree | 5cca6ab7d72bee784c425879a5f17b4c6fe1c5d8 /arch/x86/kernel | |
parent | 7c5f13519a67aa7ba3a99155f128d4bdef87d087 (diff) |
pci: Convert msi to new irq_chip functions
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ingo Molnar <mingo@elte.hu>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Russell King <linux@arm.linux.org.uk>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r-- | arch/x86/kernel/apic/io_apic.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c index 7556eb7a1a47..b79938ff9bde 100644 --- a/arch/x86/kernel/apic/io_apic.c +++ b/arch/x86/kernel/apic/io_apic.c | |||
@@ -3441,8 +3441,8 @@ ir_set_msi_irq_affinity(unsigned int irq, const struct cpumask *mask) | |||
3441 | */ | 3441 | */ |
3442 | static struct irq_chip msi_chip = { | 3442 | static struct irq_chip msi_chip = { |
3443 | .name = "PCI-MSI", | 3443 | .name = "PCI-MSI", |
3444 | .unmask = unmask_msi_irq, | 3444 | .irq_unmask = unmask_msi_irq, |
3445 | .mask = mask_msi_irq, | 3445 | .irq_mask = mask_msi_irq, |
3446 | .ack = ack_apic_edge, | 3446 | .ack = ack_apic_edge, |
3447 | #ifdef CONFIG_SMP | 3447 | #ifdef CONFIG_SMP |
3448 | .set_affinity = set_msi_irq_affinity, | 3448 | .set_affinity = set_msi_irq_affinity, |
@@ -3452,8 +3452,8 @@ static struct irq_chip msi_chip = { | |||
3452 | 3452 | ||
3453 | static struct irq_chip msi_ir_chip = { | 3453 | static struct irq_chip msi_ir_chip = { |
3454 | .name = "IR-PCI-MSI", | 3454 | .name = "IR-PCI-MSI", |
3455 | .unmask = unmask_msi_irq, | 3455 | .irq_unmask = unmask_msi_irq, |
3456 | .mask = mask_msi_irq, | 3456 | .irq_mask = mask_msi_irq, |
3457 | #ifdef CONFIG_INTR_REMAP | 3457 | #ifdef CONFIG_INTR_REMAP |
3458 | .ack = ir_ack_apic_edge, | 3458 | .ack = ir_ack_apic_edge, |
3459 | #ifdef CONFIG_SMP | 3459 | #ifdef CONFIG_SMP |