diff options
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/sn/kernel/sn2/sn_hwperf.c | 3 |
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 6c6fbca3229c..19b54fbcd7ea 100644 --- a/arch/ia64/sn/kernel/sn2/sn_hwperf.c +++ b/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) | |||
743 | if ((r = sn_hwperf_enum_objects(&nobj, &objs)) == 0) { | 743 | if ((r = sn_hwperf_enum_objects(&nobj, &objs)) == 0) { |
744 | memset(p, 0, a.sz); | 744 | memset(p, 0, a.sz); |
745 | for (i = 0; i < nobj; i++) { | 745 | for (i = 0; i < nobj; i++) { |
746 | int cpuobj_index = 0; | ||
746 | if (!SN_HWPERF_IS_NODE(objs + i)) | 747 | if (!SN_HWPERF_IS_NODE(objs + i)) |
747 | continue; | 748 | continue; |
748 | node = sn_hwperf_obj_to_cnode(objs + i); | 749 | node = sn_hwperf_obj_to_cnode(objs + i); |
749 | for_each_online_cpu(j) { | 750 | for_each_online_cpu(j) { |
750 | if (node != cpu_to_node(j)) | 751 | if (node != cpu_to_node(j)) |
751 | continue; | 752 | continue; |
752 | cpuobj = (struct sn_hwperf_object_info *) p + j; | 753 | cpuobj = (struct sn_hwperf_object_info *) p + cpuobj_index++; |
753 | slice = 'a' + cpuid_to_slice(j); | 754 | slice = 'a' + cpuid_to_slice(j); |
754 | cdata = cpu_data(j); | 755 | cdata = cpu_data(j); |
755 | cpuobj->id = j; | 756 | cpuobj->id = j; |