From c56aa251affe915a04cb929c35d5ee6e0e562347 Mon Sep 17 00:00:00 2001 From: "hawkes@sgi.com" Date: Mon, 27 Mar 2006 13:18:17 -0800 Subject: [PATCH] --- yaml --- r: 24766 b: refs/heads/master c: e6ef0fca2c61f7e773178be8c3833a709a47e022 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3a523d6f21aa..d17eacd04612 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ce9eed5a98efacb896551d3470d9d46826caaee5 +refs/heads/master: e6ef0fca2c61f7e773178be8c3833a709a47e022 diff --git a/trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c index 70db21f3df21..6ff34fc05c82 100644 --- a/trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c +++ b/trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c @@ -605,7 +605,7 @@ static int sn_hwperf_op_cpu(struct sn_hwperf_op_info *op_info) op_info->a->arg &= SN_HWPERF_ARG_OBJID_MASK; if (cpu != SN_HWPERF_ARG_ANY_CPU) { - if (cpu >= num_online_cpus() || !cpu_online(cpu)) { + if (cpu >= NR_CPUS || !cpu_online(cpu)) { r = -EINVAL; goto out; }