diff options
author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-29 07:23:42 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-30 01:44:47 -0500 |
commit | 0f23174aa8c1aa7a2a6050a72a60d290ef9ee578 (patch) | |
tree | 530ed36b528ff6f08034788cef32e0e0756d3bcc /net | |
parent | f201a8a4511a4c9953189924df3c880207194b41 (diff) |
cpumask: prepare for iterators to only go to nr_cpu_ids/nr_cpumask_bits: net
In future all cpumask ops will only be valid (in general) for bit
numbers < nr_cpu_ids. So use that instead of NR_CPUS in iterators
and other comparisons.
This is always safe: no cpu number can be >= nr_cpu_ids, and
nr_cpu_ids is initialized to NR_CPUS at boot.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Mike Travis <travis@sgi.com>
Acked-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/core/neighbour.c | 4 | ||||
-rw-r--r-- | net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c | 4 | ||||
-rw-r--r-- | net/ipv4/route.c | 4 | ||||
-rw-r--r-- | net/netfilter/nf_conntrack_standalone.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 9c3717a23cf7..f66c58df8953 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c | |||
@@ -2414,7 +2414,7 @@ static void *neigh_stat_seq_start(struct seq_file *seq, loff_t *pos) | |||
2414 | if (*pos == 0) | 2414 | if (*pos == 0) |
2415 | return SEQ_START_TOKEN; | 2415 | return SEQ_START_TOKEN; |
2416 | 2416 | ||
2417 | for (cpu = *pos-1; cpu < NR_CPUS; ++cpu) { | 2417 | for (cpu = *pos-1; cpu < nr_cpu_ids; ++cpu) { |
2418 | if (!cpu_possible(cpu)) | 2418 | if (!cpu_possible(cpu)) |
2419 | continue; | 2419 | continue; |
2420 | *pos = cpu+1; | 2420 | *pos = cpu+1; |
@@ -2429,7 +2429,7 @@ static void *neigh_stat_seq_next(struct seq_file *seq, void *v, loff_t *pos) | |||
2429 | struct neigh_table *tbl = pde->data; | 2429 | struct neigh_table *tbl = pde->data; |
2430 | int cpu; | 2430 | int cpu; |
2431 | 2431 | ||
2432 | for (cpu = *pos; cpu < NR_CPUS; ++cpu) { | 2432 | for (cpu = *pos; cpu < nr_cpu_ids; ++cpu) { |
2433 | if (!cpu_possible(cpu)) | 2433 | if (!cpu_possible(cpu)) |
2434 | continue; | 2434 | continue; |
2435 | *pos = cpu+1; | 2435 | *pos = cpu+1; |
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c index 313ebf00ee36..6ba5c557690c 100644 --- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c +++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c | |||
@@ -291,7 +291,7 @@ static void *ct_cpu_seq_start(struct seq_file *seq, loff_t *pos) | |||
291 | if (*pos == 0) | 291 | if (*pos == 0) |
292 | return SEQ_START_TOKEN; | 292 | return SEQ_START_TOKEN; |
293 | 293 | ||
294 | for (cpu = *pos-1; cpu < NR_CPUS; ++cpu) { | 294 | for (cpu = *pos-1; cpu < nr_cpu_ids; ++cpu) { |
295 | if (!cpu_possible(cpu)) | 295 | if (!cpu_possible(cpu)) |
296 | continue; | 296 | continue; |
297 | *pos = cpu+1; | 297 | *pos = cpu+1; |
@@ -306,7 +306,7 @@ static void *ct_cpu_seq_next(struct seq_file *seq, void *v, loff_t *pos) | |||
306 | struct net *net = seq_file_net(seq); | 306 | struct net *net = seq_file_net(seq); |
307 | int cpu; | 307 | int cpu; |
308 | 308 | ||
309 | for (cpu = *pos; cpu < NR_CPUS; ++cpu) { | 309 | for (cpu = *pos; cpu < nr_cpu_ids; ++cpu) { |
310 | if (!cpu_possible(cpu)) | 310 | if (!cpu_possible(cpu)) |
311 | continue; | 311 | continue; |
312 | *pos = cpu+1; | 312 | *pos = cpu+1; |
diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 77bfba975959..97f71153584f 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c | |||
@@ -429,7 +429,7 @@ static void *rt_cpu_seq_start(struct seq_file *seq, loff_t *pos) | |||
429 | if (*pos == 0) | 429 | if (*pos == 0) |
430 | return SEQ_START_TOKEN; | 430 | return SEQ_START_TOKEN; |
431 | 431 | ||
432 | for (cpu = *pos-1; cpu < NR_CPUS; ++cpu) { | 432 | for (cpu = *pos-1; cpu < nr_cpu_ids; ++cpu) { |
433 | if (!cpu_possible(cpu)) | 433 | if (!cpu_possible(cpu)) |
434 | continue; | 434 | continue; |
435 | *pos = cpu+1; | 435 | *pos = cpu+1; |
@@ -442,7 +442,7 @@ static void *rt_cpu_seq_next(struct seq_file *seq, void *v, loff_t *pos) | |||
442 | { | 442 | { |
443 | int cpu; | 443 | int cpu; |
444 | 444 | ||
445 | for (cpu = *pos; cpu < NR_CPUS; ++cpu) { | 445 | for (cpu = *pos; cpu < nr_cpu_ids; ++cpu) { |
446 | if (!cpu_possible(cpu)) | 446 | if (!cpu_possible(cpu)) |
447 | continue; | 447 | continue; |
448 | *pos = cpu+1; | 448 | *pos = cpu+1; |
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c index f37b9b74c6a8..4da54b0b9233 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c | |||
@@ -200,7 +200,7 @@ static void *ct_cpu_seq_start(struct seq_file *seq, loff_t *pos) | |||
200 | if (*pos == 0) | 200 | if (*pos == 0) |
201 | return SEQ_START_TOKEN; | 201 | return SEQ_START_TOKEN; |
202 | 202 | ||
203 | for (cpu = *pos-1; cpu < NR_CPUS; ++cpu) { | 203 | for (cpu = *pos-1; cpu < nr_cpu_ids; ++cpu) { |
204 | if (!cpu_possible(cpu)) | 204 | if (!cpu_possible(cpu)) |
205 | continue; | 205 | continue; |
206 | *pos = cpu + 1; | 206 | *pos = cpu + 1; |
@@ -215,7 +215,7 @@ static void *ct_cpu_seq_next(struct seq_file *seq, void *v, loff_t *pos) | |||
215 | struct net *net = seq_file_net(seq); | 215 | struct net *net = seq_file_net(seq); |
216 | int cpu; | 216 | int cpu; |
217 | 217 | ||
218 | for (cpu = *pos; cpu < NR_CPUS; ++cpu) { | 218 | for (cpu = *pos; cpu < nr_cpu_ids; ++cpu) { |
219 | if (!cpu_possible(cpu)) | 219 | if (!cpu_possible(cpu)) |
220 | continue; | 220 | continue; |
221 | *pos = cpu + 1; | 221 | *pos = cpu + 1; |