From: Pat Gefre Use numionodes --- 25-akpm/arch/ia64/sn/io/sn2/klgraph.c | 6 +++--- 25-akpm/arch/ia64/sn/io/sn2/ml_iograph.c | 2 +- 25-akpm/include/asm-ia64/sn/sn2/sn_private.h | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff -puN arch/ia64/sn/io/sn2/klgraph.c~sn45 arch/ia64/sn/io/sn2/klgraph.c --- 25/arch/ia64/sn/io/sn2/klgraph.c~sn45 Thu Jan 8 15:25:16 2004 +++ 25-akpm/arch/ia64/sn/io/sn2/klgraph.c Thu Jan 8 15:25:16 2004 @@ -449,7 +449,7 @@ klhwg_connect_hubs(vertex_hdl_t hwgraph_ graph_error_t rc; int port; - for (cnode = 0; cnode < numnodes; cnode++) { + for (cnode = 0; cnode < numionodes; cnode++) { nasid = COMPACT_TO_NASID_NODEID(cnode); brd = find_lboard((lboard_t *)KL_CONFIG_INFO(nasid), KLTYPE_SNIA); @@ -621,11 +621,11 @@ klhwg_add_all_nodes(vertex_hdl_t hwgraph { cnodeid_t cnode; - for (cnode = 0; cnode < numnodes; cnode++) { + for (cnode = 0; cnode < numionodes; cnode++) { klhwg_add_node(hwgraph_root, cnode); } - for (cnode = 0; cnode < numnodes; cnode++) { + for (cnode = 0; cnode < numionodes; cnode++) { klhwg_add_xbow(cnode, cnodeid_to_nasid(cnode)); } diff -puN arch/ia64/sn/io/sn2/ml_iograph.c~sn45 arch/ia64/sn/io/sn2/ml_iograph.c --- 25/arch/ia64/sn/io/sn2/ml_iograph.c~sn45 Thu Jan 8 15:25:16 2004 +++ 25-akpm/arch/ia64/sn/io/sn2/ml_iograph.c Thu Jan 8 15:25:16 2004 @@ -679,7 +679,7 @@ init_all_devices(void) cnodeid_t cnodeid, active; active = 0; - for (cnodeid = 0; cnodeid < numnodes; cnodeid++) { + for (cnodeid = 0; cnodeid < numionodes; cnodeid++) { DBG("init_all_devices: Calling io_init_node() for cnode %d\n", cnodeid); io_init_node(cnodeid); diff -puN include/asm-ia64/sn/sn2/sn_private.h~sn45 include/asm-ia64/sn/sn2/sn_private.h --- 25/include/asm-ia64/sn/sn2/sn_private.h~sn45 Thu Jan 8 15:25:16 2004 +++ 25-akpm/include/asm-ia64/sn/sn2/sn_private.h Thu Jan 8 15:25:16 2004 @@ -207,6 +207,7 @@ typedef struct cpuinfo_s { extern void xswitch_vertex_init(vertex_hdl_t xswitch); extern xtalk_provider_t hub_provider; +extern int numionodes; /* du.c */ int ducons_write(char *buf, int len); _