summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2017-01-31 13:18:37 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2017-01-31 13:18:37 +1100
commit9f14546f94e1d2fe209424865af81b3d5b7a61e8 (patch)
tree228db1d437412ce6a9a075135169e6fd68fbf5fd /lib
parenta0d383f07dcbed80f770bcdde6d8483d2c7c2e5e (diff)
parent376e5f5449d11811a8e3f61a4d4b54d68c0fd849 (diff)
Merge remote-tracking branch 'drm-misc/for-linux-next'
Diffstat (limited to 'lib')
-rw-r--r--lib/prime_numbers.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/prime_numbers.c b/lib/prime_numbers.c
index c9b3c29614aa..550eec457c2e 100644
--- a/lib/prime_numbers.c
+++ b/lib/prime_numbers.c
@@ -124,7 +124,8 @@ static bool expand_to_next_prime(unsigned long x)
return false;
sz = round_up(sz, BITS_PER_LONG);
- new = kmalloc(sizeof(*new) + bitmap_size(sz), GFP_KERNEL);
+ new = kmalloc(sizeof(*new) + bitmap_size(sz),
+ GFP_KERNEL | __GFP_NOWARN);
if (!new)
return false;