[4497] in linux-scsi channel archive
PATCH for -DDEBUG compilation
daemon@ATHENA.MIT.EDU (Eric PAIRE)
Mon Aug 3 05:21:27 1998
From: Eric PAIRE <e.paire@opengroup.org>
To: "Leonard N. Zubkoff" <lnz@dandelion.com>
Cc: linux-scsi@vger.rutgers.edu
Reply-To: Eric PAIRE <e.paire@opengroup.org>
Date: Mon, 03 Aug 1998 11:17:18 +0200
Hi Leonard,
By compiling the scsi modules with -DDEBUG flag on, I had some problems with
the double definition of SCSI_TIMEOUT. The following patch against 2.1.113
fixes it (and fixes also a double definition of MAX_SCSI_DEVICE_CODE in
scsi.c and scsi.h)
Best regards,
-Eric
P.S. I originally posted this patch in linux-kernel mailing list, but
discovered after that this was the wrong one.
+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ Eric PAIRE
Email : e.paire@gr.opengroup.org | THE Open GROUP - Grenoble Research Institute
Phone : +33 (0) 476 63 48 71 | 2, avenue de Vignate
Fax : +33 (0) 476 51 05 32 | F-38610 Gieres FRANCE
------ Cut here ------ Cut here ------ Cut here ------ Cut here ------
--- drivers/scsi/scsi.c.OLD Mon Aug 3 10:28:01 1998
+++ drivers/scsi/scsi.c Mon Aug 3 10:28:34 1998
@@ -90,14 +90,6 @@
# error You lose.
#endif
-#define MAX_SCSI_DEVICE_CODE 10
-
-#ifdef DEBUG
- #define SCSI_TIMEOUT (5*HZ)
-#else
- #define SCSI_TIMEOUT (2*HZ)
-#endif
-
#define MIN_RESET_DELAY (2*HZ)
/* Do not call reset on error if we just did a reset within 15 sec. */
--- drivers/scsi/scsi.h.OLD Wed Jul 15 16:49:06 1998
+++ drivers/scsi/scsi.h Mon Aug 3 11:08:58 1998
@@ -42,6 +42,12 @@
#define MAX_SCSI_DEVICE_CODE 10
extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE];
+#ifdef DEBUG
+ #define SCSI_TIMEOUT (5*HZ)
+#else
+ #define SCSI_TIMEOUT (2*HZ)
+#endif
+
/*
* Use these to separate status msg and our bytes
*
-
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@vger.rutgers.edu
