From: Himangi Saraogi <himangi774@gmail.com>
Date: Tue, 18 Mar 2014 17:22:26 +0000 (+0530)
Subject: rcu: Replace NR_CPUS with nr_cpu_ids
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~9870^2~29^2^2~2^2~8
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=595f3900f6b4221403493c530138b8dad2bd87f3;p=mirror_ubuntu-artful-kernel.git

rcu: Replace NR_CPUS with nr_cpu_ids

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>
---

diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c
index c6fd0f15425c..6724bd98da7d 100644
--- a/kernel/rcu/tree.c
+++ b/kernel/rcu/tree.c
@@ -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;