From: David Moore <dcm@acm.org>
Date: Thu, 8 Mar 2007 07:10:34 +0000 (+0100)
Subject: Missing critical phys_to_virt in lib/swiotlb.c
X-Git-Tag: v2.6.16.44-rc1~20
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fstable%2Flinux-2.6.16.y.git;a=commitdiff_plain;h=d4705d6dc74016619a1a6565dd54c7c5269c25d0

Missing critical phys_to_virt in lib/swiotlb.c

Adds missing call to phys_to_virt() in the
lib/swiotlb.c:swiotlb_sync_sg() function.  Without this change, a kernel
panic will always occur whenever a SWIOTLB bounce buffer from a
scatter-gather list gets synced.

Signed-off-by: David Moore <dcm@acm.org>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
---

diff --git a/lib/swiotlb.c b/lib/swiotlb.c
index 0af497b..7ca75fc 100644
--- a/lib/swiotlb.c
+++ b/lib/swiotlb.c
@@ -758,7 +758,7 @@ swiotlb_sync_sg(struct device *hwdev, struct scatterlist *sg,
 
 	for (i = 0; i < nelems; i++, sg++)
 		if (sg->dma_address != SG_ENT_PHYS_ADDRESS(sg))
-			sync_single(hwdev, (void *) sg->dma_address,
+			sync_single(hwdev, phys_to_virt(sg->dma_address),
 				    sg->dma_length, dir, target);
 }