Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11b4a1cc authored by Joerg Roedel's avatar Joerg Roedel
Browse files

x86, irq: Move irq_remapped() check into free_remapped_irq 



The function is called unconditionally now in IO-APIC code
removing another irq_remapped() check from x86 core code.

Signed-off-by: default avatarJoerg Roedel <joro@8bytes.org>
Acked-by: default avatarSebastian Andrzej Siewior <sebastian@breakpoint.cc>
Reviewed-by: default avatarKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
parent 9f9d39e4

arch/x86/kernel/apic/io_apic.c

+2 −2
Original line number Diff line number Diff line
@@ -3003,8 +3003,8 @@ void destroy_irq(unsigned int irq) 


	irq_set_status_flags(irq, IRQ_NOREQUEST|IRQ_NOPROBE);



	if (irq_remapped(cfg))

	free_remapped_irq(irq);



	raw_spin_lock_irqsave(&vector_lock, flags);

	__clear_irq_vector(irq, cfg);

	raw_spin_unlock_irqrestore(&vector_lock, flags);

drivers/iommu/irq_remapping.c

+4 −1
Original line number Diff line number Diff line
@@ -282,9 +282,12 @@ int set_remapped_irq_affinity(struct irq_data *data, const struct cpumask *mask, 


void free_remapped_irq(int irq)

{

	struct irq_cfg *cfg = irq_get_chip_data(irq);



	if (!remap_ops || !remap_ops->free_irq)

		return;



	if (irq_remapped(cfg))

		remap_ops->free_irq(irq);

}