]> granicus.if.org Git - ipset/commitdiff
Add missing __GFP_HIGHMEM flag to __vmalloc
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Thu, 20 Jan 2011 17:19:31 +0000 (18:19 +0100)
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Thu, 20 Jan 2011 17:19:31 +0000 (18:19 +0100)
We may call ip_set_alloc with GFP_ATOMIC, so we cannot replace __vmalloc
with vzalloc. Missing flag was noticed by Eric Dumazet.

kernel/ip_set_core.c

index ba2f890227ec6a6accc17c923ecbf4fee69b3ad4..ae23e6a7eb4de13e652708c4c31aaea3a4e5a626 100644 (file)
@@ -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);