From: Julian Anastasov <ja@ssi.bg>
Date: Fri, 13 Apr 2012 13:49:41 +0000 (+0300)
Subject: ipvs: LBLCR scheduler does not need GFP_ATOMIC allocation on init
X-Git-Tag: v3.5-rc1~109^2~140^2~16
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=45d4e71a39c3274f982d73688cbee2a4b286c3e3;p=karo-tx-linux.git

ipvs: LBLCR scheduler does not need GFP_ATOMIC allocation on init

	Schedulers are initialized and bound to services only
on commands.

Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Hans Schillstrom <hans@schillstrom.com>
Signed-off-by: Simon Horman <horms@verge.net.au>
---

diff --git a/net/netfilter/ipvs/ip_vs_lblcr.c b/net/netfilter/ipvs/ip_vs_lblcr.c
index 9dcd39a48897..570e31ea427a 100644
--- a/net/netfilter/ipvs/ip_vs_lblcr.c
+++ b/net/netfilter/ipvs/ip_vs_lblcr.c
@@ -511,7 +511,7 @@ static int ip_vs_lblcr_init_svc(struct ip_vs_service *svc)
 	/*
 	 *    Allocate the ip_vs_lblcr_table for this service
 	 */
-	tbl = kmalloc(sizeof(*tbl), GFP_ATOMIC);
+	tbl = kmalloc(sizeof(*tbl), GFP_KERNEL);
 	if (tbl == NULL)
 		return -ENOMEM;