Commit 9d037a77 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-fixes-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip 

* 'irq-fixes-for-linus' of git://tesla.tglx.de/git/linux-2.6-tip:
  x86, iommu: Mark DMAR IRQ as non-threaded
  genirq: Make irq_shutdown() symmetric vs. irq_startup again
parents 50f2d407 477694e7

drivers/iommu/dmar.c

+1 −1
Original line number Diff line number Diff line
@@ -1388,7 +1388,7 @@ int dmar_set_interrupt(struct intel_iommu *iommu) 
		return ret;

	}



	ret = request_irq(irq, dmar_fault, 0, iommu->name, iommu);

	ret = request_irq(irq, dmar_fault, IRQF_NO_THREAD, iommu->name, iommu);

	if (ret)

		printk(KERN_ERR "IOMMU: can't request irq\n");

	return ret;

kernel/irq/chip.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ void irq_shutdown(struct irq_desc *desc) 
	desc->depth = 1;

	if (desc->irq_data.chip->irq_shutdown)

		desc->irq_data.chip->irq_shutdown(&desc->irq_data);

	if (desc->irq_data.chip->irq_disable)

	else if (desc->irq_data.chip->irq_disable)

		desc->irq_data.chip->irq_disable(&desc->irq_data);

	else

		desc->irq_data.chip->irq_mask(&desc->irq_data);