From: Julian Anastasov Date: Fri, 13 Apr 2012 13:49:39 +0000 (+0300) Subject: ipvs: DH scheduler does not need GFP_ATOMIC allocation X-Git-Tag: v3.12-rc1~3113^2~140^2~18 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4beddbe38cb402ff509efa9dc27d3e9e188902cd;p=kernel%2Fkernel-generic.git ipvs: DH scheduler does not need GFP_ATOMIC allocation Schedulers are initialized and bound to services only on commands. Signed-off-by: Julian Anastasov Signed-off-by: Hans Schillstrom Signed-off-by: Simon Horman --- diff --git a/net/netfilter/ipvs/ip_vs_dh.c b/net/netfilter/ipvs/ip_vs_dh.c index 1a53a7a..8b7dca9 100644 --- a/net/netfilter/ipvs/ip_vs_dh.c +++ b/net/netfilter/ipvs/ip_vs_dh.c @@ -149,7 +149,7 @@ static int ip_vs_dh_init_svc(struct ip_vs_service *svc) /* allocate the DH table for this service */ tbl = kmalloc(sizeof(struct ip_vs_dh_bucket)*IP_VS_DH_TAB_SIZE, - GFP_ATOMIC); + GFP_KERNEL); if (tbl == NULL) return -ENOMEM;