summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-01-20 18:19:31 +0100
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>2011-01-20 18:19:31 +0100
commite1594c72f5d9e79b782b193525c77adcfb9ae4ee (patch)
tree0a77df5a9534cffbfacce7ce5d2d1577b6c7185c
parent13f42a71e49164769a98fc51033c65a211861404 (diff)
Add missing __GFP_HIGHMEM flag to __vmalloc
We may call ip_set_alloc with GFP_ATOMIC, so we cannot replace __vmalloc with vzalloc. Missing flag was noticed by Eric Dumazet.
-rw-r--r--kernel/ip_set_core.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/ip_set_core.c b/kernel/ip_set_core.c
index ba2f890..ae23e6a 100644
--- a/kernel/ip_set_core.c
+++ b/kernel/ip_set_core.c
@@ -188,7 +188,8 @@ ip_set_alloc(size_t size, gfp_t gfp_mask)
return members;
}
- members = __vmalloc(size, gfp_mask | __GFP_ZERO, PAGE_KERNEL);
+ members = __vmalloc(size, gfp_mask | __GFP_ZERO | __GFP_HIGHMEM,
+ PAGE_KERNEL);
if (!members)
return NULL;
pr_debug("%p: allocated with vmalloc", members);