4 files changed, 8 insertions, 8 deletions

diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index 9c3717a23cf..f66c58df895 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)
         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;
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
index 313ebf00ee3..6ba5c557690 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)
         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;
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 77bfba97595..97f71153584 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)
         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;
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)
         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;