Skip to content

Commit

Permalink
x86, irq: Move irq_remapped() check into free_remapped_irq
Browse files Browse the repository at this point in the history
The function is called unconditionally now in IO-APIC code
removing another irq_remapped() check from x86 core code.

Signed-off-by: Joerg Roedel <joro@8bytes.org>
Acked-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  • Loading branch information
Joerg Roedel committed Jan 28, 2013
1 parent 9f9d39e commit 11b4a1c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
4 changes: 2 additions & 2 deletions arch/x86/kernel/apic/io_apic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
free_remapped_irq(irq);

raw_spin_lock_irqsave(&vector_lock, flags);
__clear_irq_vector(irq, cfg);
raw_spin_unlock_irqrestore(&vector_lock, flags);
Expand Down
5 changes: 4 additions & 1 deletion drivers/iommu/irq_remapping.c
Original file line number Diff line number Diff line change
Expand Up @@ -282,10 +282,13 @@ 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;

remap_ops->free_irq(irq);
if (irq_remapped(cfg))
remap_ops->free_irq(irq);
}

void compose_remapped_msi_msg(struct pci_dev *pdev,
Expand Down

0 comments on commit 11b4a1c

Please sign in to comment.