diff options
author | Julian Anastasov <ja@ssi.bg> | 2012-04-13 09:49:38 -0400 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2012-05-08 13:37:28 -0400 |
commit | d6318f08e8d0b95960f74280cdaa7f0e00fd604c (patch) | |
tree | d8153d550fc8894b2e8cbcac3bca36bcbef76b85 /net | |
parent | 45d4e71a39c3274f982d73688cbee2a4b286c3e3 (diff) |
ipvs: SH 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>
Diffstat (limited to 'net')
-rw-r--r-- | net/netfilter/ipvs/ip_vs_sh.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/netfilter/ipvs/ip_vs_sh.c b/net/netfilter/ipvs/ip_vs_sh.c index 91e97ee049be..05126521743e 100644 --- a/net/netfilter/ipvs/ip_vs_sh.c +++ b/net/netfilter/ipvs/ip_vs_sh.c | |||
@@ -162,7 +162,7 @@ static int ip_vs_sh_init_svc(struct ip_vs_service *svc) | |||
162 | 162 | ||
163 | /* allocate the SH table for this service */ | 163 | /* allocate the SH table for this service */ |
164 | tbl = kmalloc(sizeof(struct ip_vs_sh_bucket)*IP_VS_SH_TAB_SIZE, | 164 | tbl = kmalloc(sizeof(struct ip_vs_sh_bucket)*IP_VS_SH_TAB_SIZE, |
165 | GFP_ATOMIC); | 165 | GFP_KERNEL); |
166 | if (tbl == NULL) | 166 | if (tbl == NULL) |
167 | return -ENOMEM; | 167 | return -ENOMEM; |
168 | 168 | ||