summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-17 14:26:35 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-17 14:26:35 -0800
commit8ce9a75a307e142a8871c649627555e0e4a1eefb (patch)
treeba4ef31238311bd1089507b7a27c6802488fc9db /drivers
parentb30b77493039b7b95b4d569a66af425b02651edd (diff)
parent9af88143b277f52fc6ce0d69137f435c73c39c1a (diff)
downloadlinux-8ce9a75a307e142a8871c649627555e0e4a1eefb.tar.gz
linux-8ce9a75a307e142a8871c649627555e0e4a1eefb.tar.bz2
linux-8ce9a75a307e142a8871c649627555e0e4a1eefb.zip
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: iommu: fix Intel IOMMU write-buffer flushing futex: fix reference leak Trivial conflicts fixed manually in drivers/pci/intel-iommu.c
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/intel-iommu.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/pci/intel-iommu.c b/drivers/pci/intel-iommu.c
index fa9e41626bfc..f3f686581a90 100644
--- a/drivers/pci/intel-iommu.c
+++ b/drivers/pci/intel-iommu.c
@@ -61,7 +61,7 @@
/* global iommu list, set NULL for ignored DMAR units */
static struct intel_iommu **g_iommus;
-static int rwbf_quirk = 0;
+static int rwbf_quirk;
/*
* 0: Present
@@ -3142,8 +3142,10 @@ static struct iommu_ops intel_iommu_ops = {
static void __devinit quirk_iommu_rwbf(struct pci_dev *dev)
{
- /* Mobile 4 Series Chipset neglects to set RWBF capability,
- but needs it */
+ /*
+ * Mobile 4 Series Chipset neglects to set RWBF capability,
+ * but needs it:
+ */
printk(KERN_INFO "DMAR: Forcing write-buffer flush capability\n");
rwbf_quirk = 1;
}