From 632c27dc6c4c4ce0ff21b9975952aa6c2a30d099 Mon Sep 17 00:00:00 2001 From: "hawkes@sgi.com" Date: Fri, 18 Nov 2005 11:30:34 -0800 Subject: [PATCH] --- yaml --- r: 14583 b: refs/heads/master c: 090de0b77ceed1f1d05883fa744760f0c65d9c31 h: refs/heads/master i: 14581: fd38f5e19974aa290f4db1faf4312e587f82c5da 14579: 06c88fc598892906663f66fe73a012c7e84b0e52 14575: bcfab63e3d851f221f926f530e038898b4d38321 v: v3 --- [refs] | 2 +- trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 08aa25c9ce3c..144d5fc1fbb8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9ad4f924ecd9c067a22a64699bcf4eaad1935a61 +refs/heads/master: 090de0b77ceed1f1d05883fa744760f0c65d9c31 diff --git a/trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c b/trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c index 6c6fbca3229c..19b54fbcd7ea 100644 --- a/trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c +++ b/trunk/arch/ia64/sn/kernel/sn2/sn_hwperf.c @@ -743,13 +743,14 @@ sn_hwperf_ioctl(struct inode *in, struct file *fp, u32 op, u64 arg) if ((r = sn_hwperf_enum_objects(&nobj, &objs)) == 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); for_each_online_cpu(j) { if (node != cpu_to_node(j)) continue; - cpuobj = (struct sn_hwperf_object_info *) p + j; + cpuobj = (struct sn_hwperf_object_info *) p + cpuobj_index++; slice = 'a' + cpuid_to_slice(j); cdata = cpu_data(j); cpuobj->id = j;