projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' into for-linus
[linux-2.6-microblaze.git]
/
lib
/
swiotlb.c
diff --git
a/lib/swiotlb.c
b/lib/swiotlb.c
index
32e2bd3
..
2b0b5a7
100644
(file)
--- a/
lib/swiotlb.c
+++ b/
lib/swiotlb.c
@@
-549,7
+549,7
@@
swiotlb_alloc_coherent(struct device *hwdev, size_t size,
dma_addr_t dev_addr;
void *ret;
int order = get_order(size);
- u64 dma_mask = DMA_
32BIT_MASK
;
+ u64 dma_mask = DMA_
BIT_MASK(32)
;
if (hwdev && hwdev->coherent_dma_mask)
dma_mask = hwdev->coherent_dma_mask;