From b33b2ba8d2d04d516c9f31b3862e789187f6ae8d Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Sun, 10 May 2009 20:18:18 +0100 Subject: [PATCH] --- yaml --- r: 153853 b: refs/heads/master c: 462b60f6ccc685f7e8aa04ff430e6b4ffedf629f h: refs/heads/master i: 153851: 596c96528f818f47cef72b852f20b088b43d378b v: v3 --- [refs] | 2 +- trunk/drivers/pci/intel-iommu.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a53a0652bee8..4d8bf0b9b4aa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1f0ef2aa18802a8ce7eb5a5164aaaf4d59073801 +refs/heads/master: 462b60f6ccc685f7e8aa04ff430e6b4ffedf629f diff --git a/trunk/drivers/pci/intel-iommu.c b/trunk/drivers/pci/intel-iommu.c index f47d04aced87..2e2c7406131d 100644 --- a/trunk/drivers/pci/intel-iommu.c +++ b/trunk/drivers/pci/intel-iommu.c @@ -844,10 +844,8 @@ static void iommu_flush_write_buffer(struct intel_iommu *iommu) if (!rwbf_quirk && !cap_rwbf(iommu->cap)) return; - val = iommu->gcmd | DMA_GCMD_WBF; - spin_lock_irqsave(&iommu->register_lock, flag); - writel(val, iommu->reg + DMAR_GCMD_REG); + writel(iommu->gcmd | DMA_GCMD_WBF, iommu->reg + DMAR_GCMD_REG); /* Make sure hardware complete it */ IOMMU_WAIT_OP(iommu, DMAR_GSTS_REG,