[PATCH] x86: always define DECLARE_PCI_UNMAP* macros

Ingo Molnar mingo at elte.hu
Thu Nov 27 03:45:25 PST 2008


* Joerg Roedel <joerg.roedel at amd.com> wrote:

> Currently these macros evaluate to a no-op except the kernel is 
> compiled with GART or Calgary support. But we also need these macros 
> when we have SWIOTLB, VT-d or AMD IOMMU in the kernel. Since we 
> always compile at least with SWIOTLB we can define these macros 
> always. This patch is also for stable backport for the same reason 
> the SWIOTLB default selection patch is.
> 
> Cc: stable at kernel.org
> Signed-off-by: Joerg Roedel <joerg.roedel at amd.com>
> ---
>  arch/x86/include/asm/pci_64.h |   14 --------------
>  1 files changed, 0 insertions(+), 14 deletions(-)

applied to tip/x86/urgent (for v2.6.28), as this is a DMA mapping 
bugfix for IOMMUs. If the AMD IOMMU is turned on in the .config but 
CONFIG_GART_IOMMU is off (a rare but possible combo), we'd leak on 
unmap and crash the box quickly.

Jesse, is that path of upstream merge fine with you?

	Ingo


More information about the iommu mailing list