patch-2.4.23 linux-2.4.23/arch/ia64/sn/io/sn2/pcibr/pcibr_error.c
Next file: linux-2.4.23/arch/ia64/sn/io/sn2/pcibr/pcibr_intr.c
Previous file: linux-2.4.23/arch/ia64/sn/io/sn2/pcibr/pcibr_dvr.c
Back to the patch index
Back to the overall index
- Lines: 70
- Date:
2003-11-28 10:26:19.000000000 -0800
- Orig file:
linux-2.4.22/arch/ia64/sn/io/sn2/pcibr/pcibr_error.c
- Orig date:
2003-08-25 04:44:39.000000000 -0700
diff -urN linux-2.4.22/arch/ia64/sn/io/sn2/pcibr/pcibr_error.c linux-2.4.23/arch/ia64/sn/io/sn2/pcibr/pcibr_error.c
@@ -101,6 +101,7 @@
#define F(s,n) { 1l<<(s),-(s), n }
+#if defined(FORCE_ERRORS)
static struct reg_values space_v[] =
{
{PCIIO_SPACE_NONE, "none"},
@@ -147,6 +148,7 @@
{BRIDGE_DEV_OFF_MASK, BRIDGE_DEV_OFF_ADDR_SHFT, "DEV_OFF", "%x"},
{0}
};
+#endif /* FORCE_ERRORS */
static void
print_bridge_errcmd(uint32_t cmdword, char *errtype)
@@ -663,7 +665,7 @@
entry = pcibr_list;
while (1) {
if (entry == NULL) {
- PRINT_PANIC("pcibr_error_intr_handler:\tmy parameter (0x%p) is not a pcibr_soft!", arg);
+ panic("pcibr_error_intr_handler:\tmy parameter (0x%p) is not a pcibr_soft!", arg);
}
if ((intr_arg_t) entry->bl_soft == arg)
break;
@@ -936,11 +938,11 @@
(err_status & (BRIDGE_ISR_LLP_REC_SNERR | BRIDGE_ISR_LLP_REC_CBERR))) {
printk("BRIDGE ERR_STATUS 0x%lx\n", err_status);
pcibr_error_dump(pcibr_soft);
- PRINT_PANIC("PCI Bridge Error interrupt killed the system");
+ panic("PCI Bridge Error interrupt killed the system");
}
if (err_status & BRIDGE_ISR_ERROR_FATAL) {
- PRINT_PANIC("PCI Bridge Error interrupt killed the system");
+ panic("PCI Bridge Error interrupt killed the system");
/*NOTREACHED */
}
@@ -1080,7 +1082,9 @@
int retval = IOERROR_HANDLED;
vertex_hdl_t pcibr_vhdl = pcibr_soft->bs_vhdl;
+#if defined(FORCE_ERRORS)
bridge_t *bridge = pcibr_soft->bs_base;
+#endif
iopaddr_t bad_xaddr;
@@ -1414,9 +1418,6 @@
}
#if defined(FORCE_ERRORS)
if (0) {
-#elif !DEBUG
- if (kdebug) {
-#endif
/*
* Dump raw data from Bridge/PCI layer.
*/
@@ -1444,9 +1445,8 @@
BEM_ADD_REG(device);
}
}
-#if !DEBUG || defined(FORCE_ERRORS)
}
-#endif
+#endif /* FORCE_ERRORS */
/*
* Since error could not be handled at lower level,
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)