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
Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
infiniband
/
core
/
sa_query.c
diff --git
a/drivers/infiniband/core/sa_query.c
b/drivers/infiniband/core/sa_query.c
index dcdaa79e3f0faa0dcd9288a0f14cf9e4e996210c..2aba774f835b9caca8e9e1645d1efd6cf6f08bf9 100644
(file)
--- a/
drivers/infiniband/core/sa_query.c
+++ b/
drivers/infiniband/core/sa_query.c
@@
-1086,7
+1086,7
@@
static void init_mad(struct ib_sa_mad *mad, struct ib_mad_agent *agent)
static int send_mad(struct ib_sa_query *query, int timeout_ms, gfp_t gfp_mask)
{
- bool preload =
!!(gfp_mask & __GFP_WAIT
);
+ bool preload =
gfpflags_allow_blocking(gfp_mask
);
unsigned long flags;
int ret, id;