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 tag 'dma-mapping-4.16' of git://git.infradead.org/users/hch/dma-mapping
[linux-2.6-block.git]
/
arch
/
mn10300
/
mm
/
dma-alloc.c
diff --git
a/arch/mn10300/mm/dma-alloc.c
b/arch/mn10300/mm/dma-alloc.c
index 86108d2496b35fa3727a6c9625b792fa47a21e90..e3910d4db102ba24d43a0da454dc3fe00ff2ec2e 100644
(file)
--- a/
arch/mn10300/mm/dma-alloc.c
+++ b/
arch/mn10300/mm/dma-alloc.c
@@
-37,9
+37,6
@@
static void *mn10300_dma_alloc(struct device *dev, size_t size,
goto done;
}
- /* ignore region specifiers */
- gfp &= ~(__GFP_DMA | __GFP_HIGHMEM);
-
if (dev == NULL || dev->coherent_dma_mask < 0xffffffff)
gfp |= GFP_DMA;