summaryrefslogtreecommitdiff
path: root/arch/ia64/sn/kernel/setup.c
diff options
context:
space:
mode:
authorTony Luck <aegl@agluck-desktop.(none)>2009-03-31 14:24:52 -0700
committerTony Luck <tony.luck@intel.com>2009-03-31 14:24:52 -0700
commit50fbe56c127efde659c686495eb1f925fd84ff0a (patch)
tree6eb331035b3c03b4f97ba888c6d66017e84df4c5 /arch/ia64/sn/kernel/setup.c
parent15f7176eb1cccec0a332541285ee752b935c1c85 (diff)
parent5d8c39f68e1dc78c1a958e28bc685a5bac125b21 (diff)
Pull cpumask into release branch
Diffstat (limited to 'arch/ia64/sn/kernel/setup.c')
-rw-r--r--arch/ia64/sn/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index 02c5b8a9fb60..12097776afc0 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -750,7 +750,7 @@ nasid_slice_to_cpuid(int nasid, int slice)
{
long cpu;
- for (cpu = 0; cpu < NR_CPUS; cpu++)
+ for (cpu = 0; cpu < nr_cpu_ids; cpu++)
if (cpuid_to_nasid(cpu) == nasid &&
cpuid_to_slice(cpu) == slice)
return cpu;