diff --git a/[refs] b/[refs]
index 49c5ea05cab8..ef849c79d328 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fa05f1286be25a8ce915c5dd492aea61126b3f33
+refs/heads/master: f9527f121bd42c5d300815fbf12216bc1a63f60f
diff --git a/trunk/lib/swiotlb.c b/trunk/lib/swiotlb.c
index 752fd95323f3..1a8050ade861 100644
--- a/trunk/lib/swiotlb.c
+++ b/trunk/lib/swiotlb.c
@@ -35,7 +35,7 @@
 #define OFFSET(val,align) ((unsigned long)	\
 	                   ( (val) & ( (align) - 1)))
 
-#define SG_ENT_VIRT_ADDRESS(sg)	(page_address((sg)->page) + (sg)->offset)
+#define SG_ENT_VIRT_ADDRESS(sg)	(sg_virt((sg)))
 #define SG_ENT_PHYS_ADDRESS(sg)	virt_to_bus(SG_ENT_VIRT_ADDRESS(sg))
 
 /*