projects
/
platform
/
kernel
/
linux-stable.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'stable/xen-swiotlb.bugfix' of git://git.kernel.org/pub/scm/linux/kernel...
[platform/kernel/linux-stable.git]
/
drivers
/
xen
/
swiotlb-xen.c
diff --git
a/drivers/xen/swiotlb-xen.c
b/drivers/xen/swiotlb-xen.c
index
5ac3f48
..
6e8c15a
100644
(file)
--- a/
drivers/xen/swiotlb-xen.c
+++ b/
drivers/xen/swiotlb-xen.c
@@
-54,7
+54,7
@@
u64 start_dma_addr;
static dma_addr_t xen_phys_to_bus(phys_addr_t paddr)
{
- return phys_to_machine(XPADDR(paddr)).maddr;
;
+ return phys_to_machine(XPADDR(paddr)).maddr;
}
static phys_addr_t xen_bus_to_phys(dma_addr_t baddr)