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 'stable/for-linus-4.10' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-block.git]
/
arch
/
arm64
/
mm
/
dma-mapping.c
diff --git
a/arch/arm64/mm/dma-mapping.c
b/arch/arm64/mm/dma-mapping.c
index 290a84f3351f706bd026e00364c2d433a4852aed..e04082700bb16c3598333de72b3c64659be63e5e 100644
(file)
--- a/
arch/arm64/mm/dma-mapping.c
+++ b/
arch/arm64/mm/dma-mapping.c
@@
-524,7
+524,8
@@
EXPORT_SYMBOL(dummy_dma_ops);
static int __init arm64_dma_init(void)
{
- if (swiotlb_force || max_pfn > (arm64_dma_phys_limit >> PAGE_SHIFT))
+ if (swiotlb_force == SWIOTLB_FORCE ||
+ max_pfn > (arm64_dma_phys_limit >> PAGE_SHIFT))
swiotlb = 1;
return atomic_pool_init();