diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2000-04-28 01:09:25 +0000 |
commit | b9ba7aeb165cffecdffb60aec8c3fa8d590d9ca9 (patch) | |
tree | 42d07b0c7246ae2536a702e7c5de9e2732341116 /drivers/scsi/scsi.h | |
parent | 7406b0a326f2d70ade2671c37d1beef62249db97 (diff) |
Merge with 2.3.99-pre6.
Diffstat (limited to 'drivers/scsi/scsi.h')
-rw-r--r-- | drivers/scsi/scsi.h | 4 |
1 files changed, 3 insertions, 1 deletions
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 |