projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/platform' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
[linux-2.6-block.git]
/
drivers
/
xen
/
swiotlb-xen.c
diff --git
a/drivers/xen/swiotlb-xen.c
b/drivers/xen/swiotlb-xen.c
index 29e8cd48180f5a9077250fb6af92ad3754abae43..2e74dba6a04d184844e3104b164a5175f2c83ac3 100644
(file)
--- a/
drivers/xen/swiotlb-xen.c
+++ b/
drivers/xen/swiotlb-xen.c
@@
-232,7
+232,7
@@
xen_swiotlb_alloc_coherent(struct device *hwdev, size_t size,
return ret;
if (hwdev && hwdev->coherent_dma_mask)
- dma_mask =
hwdev->coherent_dma_mask
;
+ dma_mask =
dma_alloc_coherent_mask(hwdev, flags)
;
phys = virt_to_phys(ret);
dev_addr = xen_phys_to_bus(phys);