Commit 19785845 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] sn: Fixes for shuberror.c

From: Pat Gefre <pfg@sgi.com>

Fixes for shuberror.c
parent 6e9a5549
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <asm/sn/ioerror_handling.h> #include <asm/sn/ioerror_handling.h>
#include <asm/sn/ioerror.h> #include <asm/sn/ioerror.h>
#include <asm/sn/sn2/shubio.h> #include <asm/sn/sn2/shubio.h>
#include <asm/sn/sn2/shub_mmr.h>
#include <asm/sn/bte.h> #include <asm/sn/bte.h>
extern void hubni_eint_init(cnodeid_t cnode); extern void hubni_eint_init(cnodeid_t cnode);
...@@ -171,7 +172,6 @@ hubii_eint_handler (int irq, void *arg, struct pt_regs *ep) ...@@ -171,7 +172,6 @@ hubii_eint_handler (int irq, void *arg, struct pt_regs *ep)
hubinfo_t hinfo; hubinfo_t hinfo;
ii_wstat_u_t wstat; ii_wstat_u_t wstat;
hubreg_t idsr; hubreg_t idsr;
ii_ilcsr_u_t ilcsr;
/* two levels of casting avoids compiler warning.!! */ /* two levels of casting avoids compiler warning.!! */
...@@ -226,11 +226,9 @@ hubii_eint_handler (int irq, void *arg, struct pt_regs *ep) ...@@ -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 * Only print the II_ECRAZY message if there is an attached xbow.
* to Xbow which hosts the console is dead.
*/ */
ilcsr.ii_ilcsr_regval = REMOTE_HUB_L(hinfo->h_nasid, IIO_ILCSR); if (NODEPDA(hinfo->h_cnodeid)->xbow_vhdl != 0) {
if (ilcsr.ii_ilcsr_fld_s.i_llp_en == 1) { /* Link is enabled */
printk("Hub %d, cnode %d to Xtalk Link failed (II_ECRAZY) Reason: %s", printk("Hub %d, cnode %d to Xtalk Link failed (II_ECRAZY) Reason: %s",
hinfo->h_nasid, hinfo->h_cnodeid, reason); hinfo->h_nasid, hinfo->h_cnodeid, reason);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment