summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2009-07-01 18:34:52 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-01 11:19:29 -0700
commit788d84bba47ea3eb377f7a3ae4fd1ee84b84877b (patch)
treef2241d5da4fe36949d1f5964d5134b883b329840
parente2dbe12557d85d81f4527879499f55681c3cca4f (diff)
downloadop-kernel-dev-788d84bba47ea3eb377f7a3ae4fd1ee84b84877b.zip
op-kernel-dev-788d84bba47ea3eb377f7a3ae4fd1ee84b84877b.tar.gz
Fix pci_unmap_addr() et al on i386.
We can run a 32-bit kernel on boxes with an IOMMU, so we need pci_unmap_addr() etc. to work -- without it, drivers will leak mappings. To be honest, this whole thing looks like it's more pain than it's worth; I'm half inclined to remove the no-op #else case altogether. But this is the minimal fix, which just does the right thing if CONFIG_DMAR is set. Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> Cc: stable@kernel.org [ for 2.6.30 ] Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/x86/include/asm/pci.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index 927958d..1ff685c 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -91,7 +91,7 @@ extern void pci_iommu_alloc(void);
#define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
-#if defined(CONFIG_X86_64) || defined(CONFIG_DMA_API_DEBUG)
+#if defined(CONFIG_X86_64) || defined(CONFIG_DMAR) || defined(CONFIG_DMA_API_DEBUG)
#define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME) \
dma_addr_t ADDR_NAME;
OpenPOWER on IntegriCloud