3 files changed, 6 insertions, 1 deletions

diff --git a/arch/ia64/sn/kernel/bte.c b/arch/ia64/sn/kernel/bte.c
index d71f4de44f79..dd73c0cb754b 100644
--- a/arch/ia64/sn/kernel/bte.c
+++ b/arch/ia64/sn/kernel/bte.c
@@ -137,6 +137,7 @@ retry_bteop:
                         bte = bte_if_on_node(nasid_to_try[nasid_index],bte_if_index);
 
                         if (bte == NULL) {
+                                nasid_index++;
                                 continue;
                         }
 
diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c
index 49b530c39a42..5d54f5f4e926 100644
--- a/arch/ia64/sn/kernel/sn2/sn2_smp.c
+++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c
@@ -492,6 +492,9 @@ static struct proc_dir_entry *proc_sn2_ptc;
 
 static int __init sn2_ptc_init(void)
 {
+        if (!ia64_platform_is("sn2"))
+                return -ENOSYS;
+
         if (!(proc_sn2_ptc = create_proc_entry(PTC_BASENAME, 0444, NULL))) {
                 printk(KERN_ERR "unable to create %s proc entry", PTC_BASENAME);
                 return -EINVAL;
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;