x86: Convert ht set_affinity to new chip function (be5b7bf7) · Commits · 戴 / test

arch/x86/kernel/apic/io_apic.c

+11 −14

Original line number	Diff line number	Diff line
		@@ -3646,19 +3646,16 @@ static void target_ht_irq(unsigned int irq, unsigned int dest, u8 vector)
		write_ht_irq_msg(irq, &msg);
		}

		static int set_ht_irq_affinity(unsigned int irq, const struct cpumask *mask)
		static int
		ht_set_affinity(struct irq_data data, const struct cpumask mask, bool force)
		{
		struct irq_desc *desc = irq_to_desc(irq);
		struct irq_cfg *cfg;
		struct irq_cfg *cfg = data->chip_data;
		unsigned int dest;

		if (__ioapic_set_affinity(&desc->irq_data, mask, &dest))
		if (__ioapic_set_affinity(data, mask, &dest))
		return -1;

		cfg = get_irq_desc_chip_data(desc);

		target_ht_irq(irq, dest, cfg->vector);

		target_ht_irq(data->irq, dest, cfg->vector);
		return 0;
		}

		@@ -3670,7 +3667,7 @@ static struct irq_chip ht_irq_chip = {
		.irq_unmask = unmask_ht_irq,
		.irq_ack = ack_apic_edge,
		#ifdef CONFIG_SMP
		.set_affinity = set_ht_irq_affinity,
		.irq_set_affinity = ht_set_affinity,
		#endif
		.irq_retrigger = ioapic_retrigger_irq,
		};