Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 788d84bb authored by David Woodhouse's avatar David Woodhouse Committed by Linus Torvalds
Browse files

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: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
Cc: stable@kernel.org  [ for 2.6.30 ]
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e2dbe125

arch/x86/include/asm/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -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;