From 21917c03d458e5f3c365e90bb7a0359a69917996 Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Mon, 5 Jan 2009 23:36:08 +0900
Subject: [PATCH] --- yaml --- r: 138875 b: refs/heads/master c:
 917f69b8b74e0b3283fcd1f2885949847d787d24 h: refs/heads/master i:   138873:
 73f5daf744feeb297d11a0b2bc394200ee474234   138871:
 a83a7e7982d7181b68fe377adb1007df41e34b9d v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/ia64/hp/common/hwsw_iommu.c | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a25fc0ee2f58..94df31bcd4c2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0e9cbb9ba874f9466faf82931465f00ebe4bb18c
+refs/heads/master: 917f69b8b74e0b3283fcd1f2885949847d787d24
diff --git a/trunk/arch/ia64/hp/common/hwsw_iommu.c b/trunk/arch/ia64/hp/common/hwsw_iommu.c
index 2769dbfd03bf..a40dcdd22eeb 100644
--- a/trunk/arch/ia64/hp/common/hwsw_iommu.c
+++ b/trunk/arch/ia64/hp/common/hwsw_iommu.c
@@ -13,8 +13,8 @@
  */
 
 #include <linux/device.h>
+#include <linux/dma-mapping.h>
 #include <linux/swiotlb.h>
-
 #include <asm/machvec.h>
 
 /* swiotlb declarations & definitions: */
@@ -193,3 +193,18 @@ EXPORT_SYMBOL(hwsw_sync_single_for_cpu);
 EXPORT_SYMBOL(hwsw_sync_single_for_device);
 EXPORT_SYMBOL(hwsw_sync_sg_for_cpu);
 EXPORT_SYMBOL(hwsw_sync_sg_for_device);
+
+struct dma_mapping_ops hwsw_dma_ops = {
+	.alloc_coherent		= hwsw_alloc_coherent,
+	.free_coherent		= hwsw_free_coherent,
+	.map_single_attrs	= hwsw_map_single_attrs,
+	.unmap_single_attrs	= hwsw_unmap_single_attrs,
+	.map_sg_attrs		= hwsw_map_sg_attrs,
+	.unmap_sg_attrs		= hwsw_unmap_sg_attrs,
+	.sync_single_for_cpu	= hwsw_sync_single_for_cpu,
+	.sync_sg_for_cpu	= hwsw_sync_sg_for_cpu,
+	.sync_single_for_device	= hwsw_sync_single_for_device,
+	.sync_sg_for_device	= hwsw_sync_sg_for_device,
+	.dma_supported_op	= hwsw_dma_supported,
+	.mapping_error		= hwsw_dma_mapping_error,
+};