[PATCH] Convert highest_possible_processor_id to nr_cpu_ids

We frequently need the maximum number of possible processors in order to
allocate arrays for all processors.  So far this was done using
highest_possible_processor_id().  However, we do need the number of
processors not the highest id.  Moreover the number was so far dynamically
calculated on each invokation.  The number of possible processors does not
change when the system is running.  We can therefore calculate that number
once.

Signed-off-by: Christoph Lameter <clameter@sgi.com>
Cc: Frederik Deweerdt <frederik.deweerdt@gmail.com>
Cc: Neil Brown <neilb@suse.de>
Cc: Trond Myklebust <trond.myklebust@fys.uio.no>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

2 files changed, 4 insertions, 7 deletions

diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 34c49799f9b3..ac9984f98e59 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -833,8 +833,7 @@ static int translate_table(char *name, struct ebt_table_info *newinfo)
                 /* this will get free'd in do_replace()/ebt_register_table()
                    if an error occurs */
                 newinfo->chainstack =
-                        vmalloc((highest_possible_processor_id()+1)
-                                        * sizeof(*(newinfo->chainstack)));
+                        vmalloc(nr_cpu_ids * sizeof(*(newinfo->chainstack)));
                 if (!newinfo->chainstack)
                         return -ENOMEM;
                 for_each_possible_cpu(i) {
@@ -947,8 +946,7 @@ static int do_replace(void __user *user, unsigned int len)
         if (tmp.num_counters >= INT_MAX / sizeof(struct ebt_counter))
                 return -ENOMEM;
 
-        countersize = COUNTER_OFFSET(tmp.nentries) *
-                                        (highest_possible_processor_id()+1);
+        countersize = COUNTER_OFFSET(tmp.nentries) * nr_cpu_ids;
         newinfo = vmalloc(sizeof(*newinfo) + countersize);
         if (!newinfo)
                 return -ENOMEM;
@@ -1168,8 +1166,7 @@ int ebt_register_table(struct ebt_table *table)
                 return -EINVAL;
         }
 
-        countersize = COUNTER_OFFSET(repl->nentries) *
-                                        (highest_possible_processor_id()+1);
+        countersize = COUNTER_OFFSET(repl->nentries) * nr_cpu_ids;
         newinfo = vmalloc(sizeof(*newinfo) + countersize);
         ret = -ENOMEM;
         if (!newinfo)
diff --git a/net/sunrpc/svc.c b/net/sunrpc/svc.c
index 232a99715ef2..8353829bc5c6 100644
--- a/net/sunrpc/svc.c
+++ b/net/sunrpc/svc.c
@@ -115,7 +115,7 @@ fail:
 static int
 svc_pool_map_init_percpu(struct svc_pool_map *m)
 {
-        unsigned int maxpools = highest_possible_processor_id() + 1;
+        unsigned int maxpools = nr_cpu_ids;
         unsigned int pidx = 0;
         unsigned int cpu;
         int err;