From: Julian Anastasov <ja@ssi.bg>
Date: Fri, 13 Apr 2012 13:49:42 +0000 (+0300)
Subject: ipvs: WRR scheduler does not need GFP_ATOMIC allocation
X-Git-Tag: v3.5-rc1~109^2~140^2~17
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4f2a94dcb65bcdf20d91d5bffd29b9c836559d17;p=users%2Fdwmw2%2Flinux.git

ipvs: WRR scheduler does not need GFP_ATOMIC allocation

	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_wrr.c b/net/netfilter/ipvs/ip_vs_wrr.c
index fd0d4e09876a6..231be7dd547a9 100644
--- a/net/netfilter/ipvs/ip_vs_wrr.c
+++ b/net/netfilter/ipvs/ip_vs_wrr.c
@@ -84,7 +84,7 @@ static int ip_vs_wrr_init_svc(struct ip_vs_service *svc)
 	/*
 	 *    Allocate the mark variable for WRR scheduling
 	 */
-	mark = kmalloc(sizeof(struct ip_vs_wrr_mark), GFP_ATOMIC);
+	mark = kmalloc(sizeof(struct ip_vs_wrr_mark), GFP_KERNEL);
 	if (mark == NULL)
 		return -ENOMEM;