summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRohit Vaswani <rvaswani@codeaurora.org>2016-02-01 12:17:57 -0800
committerDavid Keitel <dkeitel@codeaurora.org>2016-03-22 11:04:01 -0700
commitc2564a7fb8f1504fd672d2b6e9a8c8e8b7bd0750 (patch)
tree2251f79a3e9c7f2d75727973d7b80c170137962b
parent67097c72247a4ed0ee8d48c849edfeee2624cbea (diff)
dma_removed: Substitute __GFP_WAIT with upstream gfpflags_allow_blocking()
Signed-off-by: Rohit Vaswani <rvaswani@codeaurora.org>
-rw-r--r--drivers/base/dma-removed.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/dma-removed.c b/drivers/base/dma-removed.c
index e358c16c2ee1..a757e86bbf62 100644
--- a/drivers/base/dma-removed.c
+++ b/drivers/base/dma-removed.c
@@ -224,7 +224,7 @@ void *removed_alloc(struct device *dev, size_t size, dma_addr_t *handle,
int nbits;
unsigned int align;
- if (!(gfp & __GFP_WAIT))
+ if (!gfpflags_allow_blocking(gfp))
return NULL;
size = PAGE_ALIGN(size);