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 tag 'dma-mapping-5.1' of git://git.infradead.org/users/hch/dma-mapping
[linux-2.6-microblaze.git]
/
kernel
/
dma
/
direct.c
diff --git
a/kernel/dma/direct.c
b/kernel/dma/direct.c
index
25bd199
..
7ff807f
100644
(file)
--- a/
kernel/dma/direct.c
+++ b/
kernel/dma/direct.c
@@
-132,8
+132,7
@@
again:
goto again;
}
- if (IS_ENABLED(CONFIG_ZONE_DMA) &&
- phys_mask < DMA_BIT_MASK(32) && !(gfp & GFP_DMA)) {
+ if (IS_ENABLED(CONFIG_ZONE_DMA) && !(gfp & GFP_DMA)) {
gfp = (gfp & ~GFP_DMA32) | GFP_DMA;
goto again;
}