From 075c172a323564cf9df4fef9e27413371d50288a Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Tue, 16 Dec 2008 12:17:37 -0800
Subject: [PATCH] --- yaml --- r: 123213 b: refs/heads/master c:
 1d32251e846ccbcf9d2da041dffd1199f94b2a3b h: refs/heads/master i:   123211:
 03bc77efb9eb5543ba43c1c3ac6b66d2e7effc01 v: v3

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

diff --git a/[refs] b/[refs]
index 0b8371417810..fd340d624ae0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cfb80c9eae8c7ed8f2ee81090062d15ead51cbe8
+refs/heads/master: 1d32251e846ccbcf9d2da041dffd1199f94b2a3b
diff --git a/trunk/arch/x86/kernel/pci-swiotlb_64.c b/trunk/arch/x86/kernel/pci-swiotlb_64.c
index a991afea6700..93a8371f2c22 100644
--- a/trunk/arch/x86/kernel/pci-swiotlb_64.c
+++ b/trunk/arch/x86/kernel/pci-swiotlb_64.c
@@ -23,6 +23,16 @@ void *swiotlb_alloc(unsigned order, unsigned long nslabs)
 	return (void *)__get_free_pages(GFP_DMA | __GFP_NOWARN, order);
 }
 
+dma_addr_t swiotlb_phys_to_bus(phys_addr_t paddr)
+{
+	return paddr;
+}
+
+phys_addr_t swiotlb_bus_to_phys(dma_addr_t baddr)
+{
+	return baddr;
+}
+
 static dma_addr_t
 swiotlb_map_single_phys(struct device *hwdev, phys_addr_t paddr, size_t size,
 			int direction)