From b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Fri, 28 Apr 2000 01:09:25 +0000 Subject: Merge with 2.3.99-pre6. --- drivers/scsi/scsi.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'drivers/scsi/scsi.h') diff --git a/drivers/scsi/scsi.h b/drivers/scsi/scsi.h index 677d21410..e40d64ccb 100644 --- a/drivers/scsi/scsi.h +++ b/drivers/scsi/scsi.h @@ -105,7 +105,7 @@ extern const char *const scsi_device_types[MAX_SCSI_DEVICE_CODE]; */ #define ASSERT_LOCK(_LOCK, _COUNT) -#if defined(__SMP__) && defined(CONFIG_USER_DEBUG) +#if defined(CONFIG_SMP) && defined(CONFIG_USER_DEBUG) #undef ASSERT_LOCK #define ASSERT_LOCK(_LOCK,_COUNT) \ { if( (_LOCK)->lock != _COUNT ) \ @@ -756,6 +756,8 @@ struct scsi_cmnd { unsigned underflow; /* Return error if less than this amount is transfered */ + unsigned old_underflow; /* save underflow here when reusing the + * command for error handling */ unsigned transfersize; /* How much we are guaranteed to transfer with each SCSI transfer -- cgit v1.2.3