From e1594c72f5d9e79b782b193525c77adcfb9ae4ee Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Thu, 20 Jan 2011 18:19:31 +0100 Subject: 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. --- kernel/ip_set_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'kernel/ip_set_core.c') 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); -- cgit v1.2.3