]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
rcu: Replace NR_CPUS with nr_cpu_ids
authorHimangi Saraogi <himangi774@gmail.com>
Tue, 18 Mar 2014 17:22:26 +0000 (22:52 +0530)
committerPaul E. McKenney <paulmck@linux.vnet.ibm.com>
Tue, 29 Apr 2014 15:44:55 +0000 (08:44 -0700)
This patch replaces NR_CPUS with nr_cpu_ids as NR_CPUS should
consider cpumask_var_t.

Signed-off-by: Himangi Saraogi <himangi774@gmail.com>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Reviewed-by: Josh Triplett <josh@joshtriplett.org>
kernel/rcu/tree.c

index c6fd0f15425c86a69415430855a6b84bcfe9028f..6724bd98da7dea213bbe83dbd0ee7e35197b087b 100644 (file)
@@ -3461,8 +3461,8 @@ static void __init rcu_init_one(struct rcu_state *rsp,
                        rnp->qsmaskinit = 0;
                        rnp->grplo = j * cpustride;
                        rnp->grphi = (j + 1) * cpustride - 1;
-                       if (rnp->grphi >= NR_CPUS)
-                               rnp->grphi = NR_CPUS - 1;
+                       if (rnp->grphi >= nr_cpu_ids)
+                               rnp->grphi = nr_cpu_ids - 1;
                        if (i == 0) {
                                rnp->grpnum = 0;
                                rnp->grpmask = 0;