From fe327d5d28f5a38b827a41c642986de9c219ee9f Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Mon, 5 Jan 2009 23:47:22 +0900
Subject: [PATCH] --- yaml --- r: 138887 b: refs/heads/master c:
 4cf37bb7d9dc6dfb5d5fca7f735ba65ba173dabc h: refs/heads/master i:   138885:
 6c5cc99f189b01918f33c2887a2040640eac5aea   138883:
 5f5359208ce70ac17d0da5cebf6c14f1c7e549d2   138879:
 d703c10190849e0bccb2aca8421bb9ef967bd83b v: v3

---
 [refs]                                 |  2 +-
 trunk/arch/x86/kernel/pci-swiotlb_64.c | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index e06afdca1d9b..f94b22c532a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abe6602bf197167efb3b37161b9c11748fa076e1
+refs/heads/master: 4cf37bb7d9dc6dfb5d5fca7f735ba65ba173dabc
diff --git a/trunk/arch/x86/kernel/pci-swiotlb_64.c b/trunk/arch/x86/kernel/pci-swiotlb_64.c
index d59c91747665..d1c0366886dd 100644
--- a/trunk/arch/x86/kernel/pci-swiotlb_64.c
+++ b/trunk/arch/x86/kernel/pci-swiotlb_64.c
@@ -45,6 +45,23 @@ swiotlb_map_single_phys(struct device *hwdev, phys_addr_t paddr, size_t size,
 	return swiotlb_map_single(hwdev, phys_to_virt(paddr), size, direction);
 }
 
+/* these will be moved to lib/swiotlb.c later on */
+
+static dma_addr_t swiotlb_map_page(struct device *dev, struct page *page,
+				   unsigned long offset, size_t size,
+				   enum dma_data_direction dir,
+				   struct dma_attrs *attrs)
+{
+	return swiotlb_map_single(dev, page_address(page) + offset, size, dir);
+}
+
+static void swiotlb_unmap_page(struct device *dev, dma_addr_t dma_handle,
+			       size_t size, enum dma_data_direction dir,
+			       struct dma_attrs *attrs)
+{
+	swiotlb_unmap_single(dev, dma_handle, size, dir);
+}
+
 static void *x86_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
 					dma_addr_t *dma_handle, gfp_t flags)
 {
@@ -71,6 +88,8 @@ struct dma_mapping_ops swiotlb_dma_ops = {
 	.sync_sg_for_device = swiotlb_sync_sg_for_device,
 	.map_sg = swiotlb_map_sg,
 	.unmap_sg = swiotlb_unmap_sg,
+	.map_page = swiotlb_map_page,
+	.unmap_page = swiotlb_unmap_page,
 	.dma_supported = NULL,
 };