Merge ../scsi-rc-fixes-2.6

Conflicts:

	include/scsi/scsi_devinfo.h

Same number for two BLIST flags:  BLIST_MAX_512 and BLIST_ATTACH_PQ3

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 6913b0623167..73994e2ac2cb 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -565,7 +565,8 @@ int scsi_dispatch_cmd(struct scsi_cmnd *cmd)
         /* 
          * If SCSI-2 or lower, store the LUN value in cmnd.
          */
-        if (cmd->device->scsi_level <= SCSI_2) {
+        if (cmd->device->scsi_level <= SCSI_2 &&
+            cmd->device->scsi_level != SCSI_UNKNOWN) {
                 cmd->cmnd[1] = (cmd->cmnd[1] & 0x1f) |
                                (cmd->device->lun << 5 & 0xe0);
         }
@@ -1243,7 +1244,7 @@ static int __init init_scsi(void)
         if (error)
                 goto cleanup_sysctl;
 
-        for_each_cpu(i)
+        for_each_possible_cpu(i)
                 INIT_LIST_HEAD(&per_cpu(scsi_done_q, i));
 
         printk(KERN_NOTICE "SCSI subsystem initialized\n");