projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.4/io-poll' of git://git.kernel.dk/linux-block
[cascardo/linux.git]
/
security
/
integrity
/
ima
/
ima_crypto.c
diff --git
a/security/integrity/ima/ima_crypto.c
b/security/integrity/ima/ima_crypto.c
index
e24121a
..
6eb6293
100644
(file)
--- a/
security/integrity/ima/ima_crypto.c
+++ b/
security/integrity/ima/ima_crypto.c
@@
-126,7
+126,7
@@
static void *ima_alloc_pages(loff_t max_size, size_t *allocated_size,
{
void *ptr;
int order = ima_maxorder;
- gfp_t gfp_mask = __GFP_
WAIT
| __GFP_NOWARN | __GFP_NORETRY;
+ gfp_t gfp_mask = __GFP_
RECLAIM
| __GFP_NOWARN | __GFP_NORETRY;
if (order)
order = min(get_order(max_size), order);