Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0f23174a authored by Rusty Russell's avatar Rusty Russell Committed by David S. Miller
Browse files

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: default avatarRusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarMike Travis <travis@sgi.com>
Acked-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f201a8a4

net/core/neighbour.c

+2 −2
Original line number Diff line number Diff line
@@ -2414,7 +2414,7 @@ static void *neigh_stat_seq_start(struct seq_file *seq, loff_t *pos) 
	if (*pos == 0)

		return SEQ_START_TOKEN;



	for (cpu = *pos-1; cpu < NR_CPUS; ++cpu) {

	for (cpu = *pos-1; cpu < nr_cpu_ids; ++cpu) {

		if (!cpu_possible(cpu))

			continue;

		*pos = cpu+1;
@@ -2429,7 +2429,7 @@ static void *neigh_stat_seq_next(struct seq_file *seq, void *v, loff_t *pos) 
	struct neigh_table *tbl = pde->data;

	int cpu;



	for (cpu = *pos; cpu < NR_CPUS; ++cpu) {

	for (cpu = *pos; cpu < nr_cpu_ids; ++cpu) {

		if (!cpu_possible(cpu))

			continue;

		*pos = cpu+1;

net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c

+2 −2
Original line number Diff line number Diff line
@@ -291,7 +291,7 @@ static void *ct_cpu_seq_start(struct seq_file *seq, loff_t *pos) 
	if (*pos == 0)

		return SEQ_START_TOKEN;



	for (cpu = *pos-1; cpu < NR_CPUS; ++cpu) {

	for (cpu = *pos-1; cpu < nr_cpu_ids; ++cpu) {

		if (!cpu_possible(cpu))

			continue;

		*pos = cpu+1;
@@ -306,7 +306,7 @@ static void *ct_cpu_seq_next(struct seq_file *seq, void *v, loff_t *pos) 
	struct net *net = seq_file_net(seq);

	int cpu;



	for (cpu = *pos; cpu < NR_CPUS; ++cpu) {

	for (cpu = *pos; cpu < nr_cpu_ids; ++cpu) {

		if (!cpu_possible(cpu))

			continue;

		*pos = cpu+1;

net/ipv4/route.c

+2 −2
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static void *rt_cpu_seq_start(struct seq_file *seq, loff_t *pos) 
	if (*pos == 0)

		return SEQ_START_TOKEN;



	for (cpu = *pos-1; cpu < NR_CPUS; ++cpu) {

	for (cpu = *pos-1; cpu < nr_cpu_ids; ++cpu) {

		if (!cpu_possible(cpu))

			continue;

		*pos = cpu+1;
@@ -442,7 +442,7 @@ static void *rt_cpu_seq_next(struct seq_file *seq, void *v, loff_t *pos) 
{

	int cpu;



	for (cpu = *pos; cpu < NR_CPUS; ++cpu) {

	for (cpu = *pos; cpu < nr_cpu_ids; ++cpu) {

		if (!cpu_possible(cpu))

			continue;

		*pos = cpu+1;

net/netfilter/nf_conntrack_standalone.c

+2 −2
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ static void *ct_cpu_seq_start(struct seq_file *seq, loff_t *pos) 
	if (*pos == 0)

		return SEQ_START_TOKEN;



	for (cpu = *pos-1; cpu < NR_CPUS; ++cpu) {

	for (cpu = *pos-1; cpu < nr_cpu_ids; ++cpu) {

		if (!cpu_possible(cpu))

			continue;

		*pos = cpu + 1;
@@ -215,7 +215,7 @@ static void *ct_cpu_seq_next(struct seq_file *seq, void *v, loff_t *pos) 
	struct net *net = seq_file_net(seq);

	int cpu;



	for (cpu = *pos; cpu < NR_CPUS; ++cpu) {

	for (cpu = *pos; cpu < nr_cpu_ids; ++cpu) {

		if (!cpu_possible(cpu))

			continue;

		*pos = cpu + 1;