1 files changed, 24 insertions, 16 deletions

diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index d35f2a6f9c94..4fb44984afe6 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 1999,2001-2004 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1999,2001-2005 Silicon Graphics, Inc. All rights reserved.
  */
 
 #include <linux/config.h>
@@ -73,6 +73,12 @@ EXPORT_SYMBOL(sn_rtc_cycles_per_second);
 DEFINE_PER_CPU(struct sn_hub_info_s, __sn_hub_info);
 EXPORT_PER_CPU_SYMBOL(__sn_hub_info);
 
+DEFINE_PER_CPU(short, __sn_cnodeid_to_nasid[MAX_NUMNODES]);
+EXPORT_PER_CPU_SYMBOL(__sn_cnodeid_to_nasid);
+
+DEFINE_PER_CPU(struct nodepda_s *, __sn_nodepda);
+EXPORT_PER_CPU_SYMBOL(__sn_nodepda);
+
 partid_t sn_partid = -1;
 EXPORT_SYMBOL(sn_partid);
 char sn_system_serial_number_string[128];
@@ -373,11 +379,11 @@ static void __init sn_init_pdas(char **cmdline_p)
 {
         cnodeid_t cnode;
 
-        memset(pda->cnodeid_to_nasid_table, -1,
-               sizeof(pda->cnodeid_to_nasid_table));
+        memset(sn_cnodeid_to_nasid, -1,
+                        sizeof(__ia64_per_cpu_var(__sn_cnodeid_to_nasid)));
         for_each_online_node(cnode)
-                pda->cnodeid_to_nasid_table[cnode] =
-                    pxm_to_nasid(nid_to_pxm_map[cnode]);
+                sn_cnodeid_to_nasid[cnode] =
+                                pxm_to_nasid(nid_to_pxm_map[cnode]);
 
         numionodes = num_online_nodes();
         scan_for_ionodes();
@@ -477,7 +483,8 @@ void __init sn_cpu_init(void)
 
         cnode = nasid_to_cnodeid(nasid);
 
-        pda->p_nodepda = nodepdaindr[cnode];
+        sn_nodepda = nodepdaindr[cnode];
+
         pda->led_address =
             (typeof(pda->led_address)) (LED0 + (slice << LED_CPU_SHIFT));
         pda->led_state = LED_ALWAYS_SET;
@@ -486,15 +493,18 @@ void __init sn_cpu_init(void)
         pda->idle_flag = 0;
 
         if (cpuid != 0) {
-                memcpy(pda->cnodeid_to_nasid_table,
-                       pdacpu(0)->cnodeid_to_nasid_table,
-                       sizeof(pda->cnodeid_to_nasid_table));
+                /* copy cpu 0's sn_cnodeid_to_nasid table to this cpu's */
+                memcpy(sn_cnodeid_to_nasid,
+                       (&per_cpu(__sn_cnodeid_to_nasid, 0)),
+                       sizeof(__ia64_per_cpu_var(__sn_cnodeid_to_nasid)));
         }
 
         /*
          * Check for WARs.
          * Only needs to be done once, on BSP.
-         * Has to be done after loop above, because it uses pda.cnodeid_to_nasid_table[i].
+         * Has to be done after loop above, because it uses this cpu's
+         * sn_cnodeid_to_nasid table which was just initialized if this
+         * isn't cpu 0.
          * Has to be done before assignment below.
          */
         if (!wars_have_been_checked) {
@@ -580,8 +590,7 @@ static void __init scan_for_ionodes(void)
                 brd = find_lboard_any(brd, KLTYPE_SNIA);
 
                 while (brd) {
-                        pda->cnodeid_to_nasid_table[numionodes] =
-                            brd->brd_nasid;
+                        sn_cnodeid_to_nasid[numionodes] = brd->brd_nasid;
                         physical_node_map[brd->brd_nasid] = numionodes;
                         root_lboard[numionodes] = brd;
                         numionodes++;
@@ -602,8 +611,7 @@ static void __init scan_for_ionodes(void)
                                       root_lboard[nasid_to_cnodeid(nasid)],
                                       KLTYPE_TIO);
                 while (brd) {
-                        pda->cnodeid_to_nasid_table[numionodes] =
-                            brd->brd_nasid;
+                        sn_cnodeid_to_nasid[numionodes] = brd->brd_nasid;
                         physical_node_map[brd->brd_nasid] = numionodes;
                         root_lboard[numionodes] = brd;
                         numionodes++;
@@ -614,7 +622,6 @@ static void __init scan_for_ionodes(void)
                         brd = find_lboard_any(brd, KLTYPE_TIO);
                 }
         }
-
 }
 
 int
@@ -623,7 +630,8 @@ nasid_slice_to_cpuid(int nasid, int slice)
         long cpu;
         
         for (cpu=0; cpu < NR_CPUS; cpu++) 
-                if (nodepda->phys_cpuid[cpu].nasid == nasid && nodepda->phys_cpuid[cpu].slice == slice)
+                if (cpuid_to_nasid(cpu) == nasid &&
+                                        cpuid_to_slice(cpu) == slice)
                         return cpu;
 
         return -1;