projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm64: Align CMA sizes to PAGE_SIZE
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm64
/
mm
/
dma-mapping.c
diff --git
a/arch/arm64/mm/dma-mapping.c
b/arch/arm64/mm/dma-mapping.c
index 45b5ab54c9eeb04730d363d13fc43a40d138aabe..fbd76785c5db640bf511a9647380ebb1ae29b3ef 100644
(file)
--- a/
arch/arm64/mm/dma-mapping.c
+++ b/
arch/arm64/mm/dma-mapping.c
@@
-45,6
+45,7
@@
static void *arm64_swiotlb_alloc_coherent(struct device *dev, size_t size,
if (IS_ENABLED(CONFIG_DMA_CMA)) {
struct page *page;
if (IS_ENABLED(CONFIG_DMA_CMA)) {
struct page *page;
+ size = PAGE_ALIGN(size);
page = dma_alloc_from_contiguous(dev, size >> PAGE_SHIFT,
get_order(size));
if (!page)
page = dma_alloc_from_contiguous(dev, size >> PAGE_SHIFT,
get_order(size));
if (!page)