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/netfilter | |
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/netfilter')
-rw-r--r-- | net/netfilter/nf_conntrack_standalone.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c index f37b9b74c6a..4da54b0b923 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; |