diff -Nru a/arch/ia64/sn/io/sn2/ml_iograph.c b/arch/ia64/sn/io/sn2/ml_iograph.c --- a/arch/ia64/sn/io/sn2/ml_iograph.c Sat Sep 27 16:24:56 2003 +++ b/arch/ia64/sn/io/sn2/ml_iograph.c Sat Sep 27 16:24:56 2003 @@ -508,13 +508,10 @@ ASSERT_ALWAYS(to); rc = hwgraph_edge_add(from, to, EDGE_LBL_INTERCONNECT); - if (rc == -EEXIST) - goto link_done; - if (rc != GRAPH_SUCCESS) { + if (rc != -EEXIST && rc != GRAPH_SUCCESS) { printk("%s: Unable to establish link" " for xbmon.", pathname); } -link_done: } #ifdef SN0_USE_BTE @@ -617,7 +614,6 @@ nodepda_t *npdap; struct semaphore *peer_sema = 0; uint32_t widget_partnum; - cpu_cookie_t c = 0; npdap = NODEPDA(cnodeid); diff -Nru a/arch/ia64/sn/io/sn2/shub.c b/arch/ia64/sn/io/sn2/shub.c --- a/arch/ia64/sn/io/sn2/shub.c Sat Sep 27 16:24:56 2003 +++ b/arch/ia64/sn/io/sn2/shub.c Sat Sep 27 16:24:56 2003 @@ -203,7 +203,7 @@ uint64_t longarg; int nasid; - cnode = (cnodeid_t)file->f_dentry->d_fsdata; + cnode = (cnodeid_t)(long)file->f_dentry->d_fsdata; switch (cmd) { case SNDRV_SHUB_CONFIGURE: - To unsubscribe from this list: send the line "unsubscribe linux-ia64" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.htmlReceived on Sat Sep 27 10:27:20 2003
This archive was generated by hypermail 2.1.8 : 2005-08-02 09:20:18 EST