X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=net%2Fxfrm%2Fxfrm_ipcomp.c;h=b943c7fc5ed2d9289846cca35f01822a5d88c772;hb=5cf4eb54c2dcae681279a9cfca5498cfe65c5384;hp=2906d520eea7c2b7636fc94f3a60f5131701f57d;hpb=5bf47256f5433a9a5782754664e5ea04acb0537d;p=~andy%2Flinux diff --git a/net/xfrm/xfrm_ipcomp.c b/net/xfrm/xfrm_ipcomp.c index 2906d520eea..b943c7fc5ed 100644 --- a/net/xfrm/xfrm_ipcomp.c +++ b/net/xfrm/xfrm_ipcomp.c @@ -220,8 +220,8 @@ static void ipcomp_free_scratches(void) static void * __percpu *ipcomp_alloc_scratches(void) { - int i; void * __percpu *scratches; + int i; if (ipcomp_scratch_users++) return ipcomp_scratches; @@ -233,7 +233,9 @@ static void * __percpu *ipcomp_alloc_scratches(void) ipcomp_scratches = scratches; for_each_possible_cpu(i) { - void *scratch = vmalloc(IPCOMP_SCRATCH_SIZE); + void *scratch; + + scratch = vmalloc_node(IPCOMP_SCRATCH_SIZE, cpu_to_node(i)); if (!scratch) return NULL; *per_cpu_ptr(scratches, i) = scratch;