Merge branch 'x86-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

	  BIOS code.

config GART_IOMMU

	bool "GART IOMMU support" if EXPERT

	default y

	bool "Old AMD GART IOMMU support"

	select SWIOTLB

	depends on X86_64 && PCI && AMD_NB

	---help---

	  Support for full DMA access of devices with 32bit memory access only

	  on systems with more than 3GB. This is usually needed for USB,

	  sound, many IDE/SATA chipsets and some other devices.

	  Provides a driver for the AMD Athlon64/Opteron/Turion/Sempron GART

	  based hardware IOMMU and a software bounce buffer based IOMMU used

	  on Intel systems and as fallback.

	  The code is only active when needed (enough memory and limited

	  device) unless CONFIG_IOMMU_DEBUG or iommu=force is specified

	  too.

	  Provides a driver for older AMD Athlon64/Opteron/Turion/Sempron

	  GART based hardware IOMMUs.

	  The GART supports full DMA access for devices with 32-bit access

	  limitations, on systems with more than 3 GB. This is usually needed

	  for USB, sound, many IDE/SATA chipsets and some other devices.

	  Newer systems typically have a modern AMD IOMMU, supported via

	  the CONFIG_AMD_IOMMU=y config option.

	  In normal configurations this driver is only active when needed:

	  there's more than 3 GB of memory and the system contains a

	  32-bit limited device.

	  If unsure, say Y.

config CALGARY_IOMMU

	bool "IBM Calgary IOMMU support"