From 197858451179ed8ee1d0383b2f2da1800f1ee866 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Sun, 18 Jan 2004 18:49:58 -0800 Subject: [PATCH] [PATCH] sn: Fixes for shuberror.c From: Pat Gefre Fixes for shuberror.c --- arch/ia64/sn/io/sn2/shuberror.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/ia64/sn/io/sn2/shuberror.c b/arch/ia64/sn/io/sn2/shuberror.c index ea37b08ca918e..906d8d0a67f0f 100644 --- a/arch/ia64/sn/io/sn2/shuberror.c +++ b/arch/ia64/sn/io/sn2/shuberror.c @@ -29,6 +29,7 @@ #include #include #include +#include #include extern void hubni_eint_init(cnodeid_t cnode); @@ -171,7 +172,6 @@ hubii_eint_handler (int irq, void *arg, struct pt_regs *ep) hubinfo_t hinfo; ii_wstat_u_t wstat; hubreg_t idsr; - ii_ilcsr_u_t ilcsr; /* two levels of casting avoids compiler warning.!! */ @@ -226,11 +226,9 @@ hubii_eint_handler (int irq, void *arg, struct pt_regs *ep) } /* - * Note: we may never be able to print this, if the II talking - * to Xbow which hosts the console is dead. + * Only print the II_ECRAZY message if there is an attached xbow. */ - ilcsr.ii_ilcsr_regval = REMOTE_HUB_L(hinfo->h_nasid, IIO_ILCSR); - if (ilcsr.ii_ilcsr_fld_s.i_llp_en == 1) { /* Link is enabled */ + if (NODEPDA(hinfo->h_cnodeid)->xbow_vhdl != 0) { printk("Hub %d, cnode %d to Xtalk Link failed (II_ECRAZY) Reason: %s", hinfo->h_nasid, hinfo->h_cnodeid, reason); } -- 2.53.0