summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJulian Anastasov <ja@ssi.bg>2012-04-13 16:49:41 +0300
committerPablo Neira Ayuso <pablo@netfilter.org>2012-05-08 19:37:26 +0200
commit45d4e71a39c3274f982d73688cbee2a4b286c3e3 (patch)
tree629cd0444d2a4ad1042d59a5b01ed4c89f0c714a /net
parent4f2a94dcb65bcdf20d91d5bffd29b9c836559d17 (diff)
downloadblackbird-op-linux-45d4e71a39c3274f982d73688cbee2a4b286c3e3.tar.gz
blackbird-op-linux-45d4e71a39c3274f982d73688cbee2a4b286c3e3.zip
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>
Diffstat (limited to 'net')
-rw-r--r--net/netfilter/ipvs/ip_vs_lblcr.c2
1 files changed, 1 insertions, 1 deletions
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;
OpenPOWER on IntegriCloud