aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Goodwin <markgw@sgi.com>2007-07-13 11:59:37 +1000
committerTony Luck <tony.luck@intel.com>2007-07-13 16:09:46 -0700
commit83e12a076e3587d60cfbe65a761ef54e14a264e3 (patch)
tree3ef61cd64c181ea9a90bd3f783141b2a80e25b8d
parent788b5f0834ea1566b931cf1ce8424027b3c4caf0 (diff)
[IA64] correctly count CPU objects in the ia64/sn hwperf interface
Correctly count CPU objects for SGI ia64/sn hwperf interface Signed-off-by: Mark Goodwin <markgw@sgi.com> Signed-off-by: Jack Steiner <steiner@sgi.com> Signed-off-by: Tony Luck <tony.luck@intel.com>
-rw-r--r--arch/ia64/sn/kernel/sn2/sn_hwperf.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
index 6da9854751c..df8d5bed611 100644
--- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c
+++ b/arch/ia64/sn/kernel/sn2/sn_hwperf.c
@@ -750,9 +750,10 @@ sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, u64 arg)
goto error;
} else
if ((r = sn_hwperf_enum_objects(&nobj, &objs)) == 0) {
+ int cpuobj_index = 0;
+
memset(p, 0, a.sz);
for (i = 0; i < nobj; i++) {
- int cpuobj_index = 0;
if (!SN_HWPERF_IS_NODE(objs + i))
continue;
node = sn_hwperf_obj_to_cnode(objs + i);