Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

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)
                 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;