Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (166 commits)
  [SCSI] ibmvscsi: convert to use the data buffer accessors
  [SCSI] dc395x: convert to use the data buffer accessors
  [SCSI] ncr53c8xx: convert to use the data buffer accessors
  [SCSI] sym53c8xx: convert to use the data buffer accessors
  [SCSI] ppa: coding police and printk levels
  [SCSI] aic7xxx_old: remove redundant GFP_ATOMIC from kmalloc
  [SCSI] i2o: remove redundant GFP_ATOMIC from kmalloc from device.c
  [SCSI] remove the dead CYBERSTORMIII_SCSI option
  [SCSI] don't build scsi_dma_{map,unmap} for !HAS_DMA
  [SCSI] Clean up scsi_add_lun a bit
  [SCSI] 53c700: Remove printk, which triggers because of low scsi clock on SNI RMs
  [SCSI] sni_53c710: Cleanup
  [SCSI] qla4xxx: Fix underrun/overrun conditions
  [SCSI] megaraid_mbox: use mutex instead of semaphore
  [SCSI] aacraid: add 51245, 51645 and 52245 adapters to documentation.
  [SCSI] qla2xxx: update version to 8.02.00-k1.
  [SCSI] qla2xxx: add support for NPIV
  [SCSI] stex: use resid for xfer len information
  [SCSI] Add Brownie 1200U3P to blacklist
  [SCSI] scsi.c: convert to use the data buffer accessors
  ...

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/scsi/megaraid/megaraid_mbox.h b/drivers/scsi/megaraid/megaraid_mbox.h
index 9de803cebd4b..626459d1e902 100644
--- a/drivers/scsi/megaraid/megaraid_mbox.h
+++ b/drivers/scsi/megaraid/megaraid_mbox.h
@@ -168,7 +168,7 @@ typedef struct {
  * @hw_error                    : set if FW not responding
  * @fast_load                   : If set, skip physical device scanning
  * @channel_class               : channel class, RAID or SCSI
- * @sysfs_sem                   : semaphore to serialize access to sysfs res.
+ * @sysfs_mtx                   : mutex to serialize access to sysfs res.
  * @sysfs_uioc                  : management packet to issue FW calls from sysfs
  * @sysfs_mbox64                : mailbox packet to issue FW calls from sysfs
  * @sysfs_buffer                : data buffer for FW commands issued from sysfs
@@ -208,7 +208,7 @@ typedef struct {
         int                             hw_error;
         int                             fast_load;
         uint8_t                         channel_class;
-        struct semaphore                sysfs_sem;
+        struct mutex                    sysfs_mtx;
         uioc_t                          *sysfs_uioc;
         mbox64_t                        *sysfs_mbox64;
         caddr_t                         sysfs_buffer;