Update from upstream with manual merge of Yasunori Goto's

changes to swiotlb.c made in commit 281dd25c
since this file has been moved from arch/ia64/lib/swiotlb.c to
lib/swiotlb.c

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