Fedora Core 2 Updates 2.6.10-1.771_FC2

[linux-2.6.git] / arch / ia64 / sn / io / platform_init / sgi_io_init.c

diff --git a/arch/ia64/sn/io/platform_init/sgi_io_init.c b/arch/ia64/sn/io/platform_init/sgi_io_init.c
index e8dd0ae..4833cfb 100644 (file)
--- a/arch/ia64/sn/io/platform_init/sgi_io_init.c
+++ b/arch/ia64/sn/io/platform_init/sgi_io_init.c
@@ -26,7 +26,6 @@ extern vertex_hdl_t hwgraph_root;
 extern void io_module_init(void);
 extern int pci_bus_to_hcl_cvlink(void);
 
-cpuid_t master_procid;
 nasid_t console_nasid = (nasid_t) - 1;
 char master_baseio_wid;
 
@@ -38,7 +37,7 @@ nasid_t master_nasid = INVALID_NASID; /* This is the partition master nasid */
  *
  *     This code is executed once for each Hub chip.
  */
-static void
+static void __init
 per_hub_init(cnodeid_t cnode)
 {
        nasid_t nasid;
@@ -47,10 +46,10 @@ per_hub_init(cnodeid_t cnode)
        ii_ibcr_u_t ii_ibcr;
        ii_ilcsr_u_t ii_ilcsr;
 
-       nasid = COMPACT_TO_NASID_NODEID(cnode);
+       nasid = cnodeid_to_nasid(cnode);
 
        ASSERT(nasid != INVALID_NASID);
-       ASSERT(NASID_TO_COMPACT_NODEID(nasid) == cnode);
+       ASSERT(nasid_to_cnodeid(nasid) == cnode);
 
        npdap = NODEPDA(cnode);
 
@@ -131,10 +130,8 @@ sgi_master_io_infr_init(void)
        klhwg_add_all_modules(hwgraph_root);
        klhwg_add_all_nodes(hwgraph_root);
 
-       for (cnode = 0; cnode < numionodes; cnode++) {
-               extern void per_hub_init(cnodeid_t);
+       for (cnode = 0; cnode < numionodes; cnode++)
                per_hub_init(cnode);
-       }
 
        /*
         *
@@ -150,7 +147,7 @@ inline int
 check_nasid_equiv(nasid_t nasida, nasid_t nasidb)
 {
        if ((nasida == nasidb)
-           || (nasida == NODEPDA(NASID_TO_COMPACT_NODEID(nasidb))->xbow_peer))
+           || (nasida == NODEPDA(nasid_to_cnodeid(nasidb))->xbow_peer))
                return 1;
        else
                return 0;