summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-09-19 17:23:41 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-09-19 17:23:41 -0700
commit9d037a777695993ec7437e5f451647dea7919d4c (patch)
tree05f047598aeff2e48653bb6b3dfa3a63b2068e12 /drivers
parent50f2d407c09be74c77cf9d502d087398a5ba6055 (diff)
parent477694e71113fd0694b6bb0bcc2d006b8ac62691 (diff)
downloadlinux-3.10-9d037a777695993ec7437e5f451647dea7919d4c.tar.gz
linux-3.10-9d037a777695993ec7437e5f451647dea7919d4c.tar.bz2
linux-3.10-9d037a777695993ec7437e5f451647dea7919d4c.zip
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/iommu/dmar.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index 3dc9befa5ae..6dcc7e2d54d 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -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;