manual update from upstream:

Applied Al's change 06a544971fad0992fe8b92c5647538d573089dd4
to new location of swiotlb.c

Signed-off-by: Tony Luck <tony.luck@intel.com>

diff --cc arch/ia64/Kconfig
Simple merge

diff --cc include/asm-x86_64/dma-mapping.h
Simple merge

diff --cc include/asm-x86_64/swiotlb.h
Simple merge

diff --cc lib/swiotlb.c
Simple merge