Commit b5d1c465 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: Convert remapped msi to new chip.irq_set_affinity function 



Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
parent f19f5ecc

arch/x86/kernel/apic/io_apic.c

+17 −17
Original line number Diff line number Diff line
@@ -3310,17 +3310,17 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force) 
 * done in the process context using interrupt-remapping hardware.

 */

static int

ir_set_msi_irq_affinity(unsigned int irq, const struct cpumask *mask)

ir_msi_set_affinity(struct irq_data *data, const struct cpumask *mask,

		    bool force)

{

	struct irq_desc *desc = irq_to_desc(irq);

	struct irq_cfg *cfg = get_irq_desc_chip_data(desc);

	unsigned int dest;

	struct irq_cfg *cfg = data->chip_data;

	unsigned int dest, irq = data->irq;

	struct irte irte;



	if (get_irte(irq, &irte))

		return -1;



	if (__ioapic_set_affinity(&desc->irq_data, mask, &dest))

	if (__ioapic_set_affinity(data, mask, &dest))

		return -1;



	irte.vector = cfg->vector;
@@ -3367,7 +3367,7 @@ static struct irq_chip msi_ir_chip = { 
#ifdef CONFIG_INTR_REMAP

	.irq_ack		= ir_ack_apic_edge,

#ifdef CONFIG_SMP

	.set_affinity	= ir_set_msi_irq_affinity,

	.irq_set_affinity	= ir_msi_set_affinity,

#endif

#endif

	.irq_retrigger		= ioapic_retrigger_irq,
@@ -3575,7 +3575,7 @@ static struct irq_chip ir_hpet_msi_type = { 
#ifdef CONFIG_INTR_REMAP

	.irq_ack		= ir_ack_apic_edge,

#ifdef CONFIG_SMP

	.set_affinity = ir_set_msi_irq_affinity,

	.irq_set_affinity	= ir_msi_set_affinity,

#endif

#endif

	.irq_retrigger		= ioapic_retrigger_irq,