From: Patrick McHardy Date: Tue, 18 Dec 2007 05:55:59 +0000 (-0800) Subject: [NETFILTER]: arp_tables: use vmalloc_node() X-Git-Tag: v2.6.25-rc1~1162^2~1028 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=197631201ec2833f50ac50e6aa7c8ee151e66dda;p=linux-2.6 [NETFILTER]: arp_tables: use vmalloc_node() Use vmalloc_node() as in ip_tables.c. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller --- diff --git a/net/ipv4/netfilter/arp_tables.c b/net/ipv4/netfilter/arp_tables.c index 8b1842baba..fb4d77978e 100644 --- a/net/ipv4/netfilter/arp_tables.c +++ b/net/ipv4/netfilter/arp_tables.c @@ -804,7 +804,8 @@ static int do_replace(void __user *user, unsigned int len) goto free_newinfo; } - counters = vmalloc(tmp.num_counters * sizeof(struct xt_counters)); + counters = vmalloc_node(tmp.num_counters * sizeof(struct xt_counters), + numa_node_id()); if (!counters) { ret = -ENOMEM; goto free_newinfo; @@ -902,7 +903,7 @@ static int do_add_counters(void __user *user, unsigned int len) if (len != sizeof(tmp) + tmp.num_counters*sizeof(struct xt_counters)) return -EINVAL; - paddc = vmalloc(len); + paddc = vmalloc_node(len, numa_node_id()); if (!paddc) return -ENOMEM;