diff options
| author | Jani Nikula <jani.nikula@intel.com> | 2023-10-04 18:06:27 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2023-10-04 18:06:27 +0300 |
| commit | 7824a88b4286980512de2a46763646100274a5ac (patch) | |
| tree | fc10f5509fa12f85b72ba14c9bdf62641278f303 /drivers/scsi/megaraid/megaraid_sas.h | |
| parent | 25591b66d0a4f9277241cebe1a74b4f985bc27a9 (diff) | |
| parent | caacbdc28f545744770fb2caf347b3c4be9a6299 (diff) | |
| download | linux-7824a88b4286980512de2a46763646100274a5ac.tar.xz | |
Merge drm/drm-next into drm-intel-next
Backmerge to sync up with drm-intel-gt-next and drm-misc-next.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_sas.h')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h index 3554f6b07727..94abba57582d 100644 --- a/drivers/scsi/megaraid/megaraid_sas.h +++ b/drivers/scsi/megaraid/megaraid_sas.h @@ -2332,7 +2332,7 @@ struct megasas_instance { u32 support_morethan256jbod; /* FW support for more than 256 PD/JBOD */ bool use_seqnum_jbod_fp; /* Added for PD sequence */ bool smp_affinity_enable; - spinlock_t crashdump_lock; + struct mutex crashdump_lock; struct megasas_register_set __iomem *reg_set; u32 __iomem *reply_post_host_index_addr[MR_MAX_MSIX_REG_ARRAY]; |