patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / arch / ia64 / sn / io / sn2 / ml_SN_intr.c

diff --git a/arch/ia64/sn/io/sn2/ml_SN_intr.c b/arch/ia64/sn/io/sn2/ml_SN_intr.c
index 8fb2eda..1d90a36 100644 (file)
--- a/arch/ia64/sn/io/sn2/ml_SN_intr.c
+++ b/arch/ia64/sn/io/sn2/ml_SN_intr.c
@@ -12,6 +12,7 @@
 #include <asm/smp.h>
 #include <asm/irq.h>
 #include <asm/hw_irq.h>
+#include <asm/topology.h>
 #include <asm/sn/sgi.h>
 #include <asm/sn/iograph.h>
 #include <asm/sn/hcl.h>
@@ -43,7 +44,6 @@ void intr_init_vecblk(cnodeid_t node)
        sh_ii_int0_config_u_t           ii_int_config;
        cpuid_t                         cpu;
        cpuid_t                         cpu0, cpu1;
-       nodepda_t                       *lnodepda;
        sh_ii_int0_enable_u_t           ii_int_enable;
        sh_int_node_id_config_u_t       node_id_config;
        sh_local_int5_config_u_t        local5_config;
@@ -60,15 +60,13 @@ void intr_init_vecblk(cnodeid_t node)
                HUB_S((unsigned long *)GLOBAL_MMR_ADDR(nasid, SH_INT_NODE_ID_CONFIG),
                        node_id_config.sh_int_node_id_config_regval);
                cnode = nasid_to_cnodeid(master_nasid);
-               lnodepda = NODEPDA(cnode);
-               cpu = lnodepda->node_first_cpu;
+               cpu = first_cpu(node_to_cpumask(cnode));
                cpu = cpu_physical_id(cpu);
                SAL_CALL(ret_stuff, SN_SAL_REGISTER_CE, nasid, cpu, master_nasid,0,0,0,0);
                if (ret_stuff.status < 0)
                        printk("%s: SN_SAL_REGISTER_CE SAL_CALL failed\n",__FUNCTION__);
        } else {
-               lnodepda = NODEPDA(node);
-               cpu = lnodepda->node_first_cpu;
+               cpu = first_cpu(node_to_cpumask(node));
                cpu = cpu_physical_id(cpu);
        }