Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi (a2c2df86) · Commits · 戴 / test

Pull SCSI fixes from James Bottomley: "This is a couple of minor fixes, one for a preempt warning in the mpt2sas driver and one is a config failure with the new sd async domain." * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: [SCSI] Fix sd_probe_domain config problem [SCSI] mpt2sas: Fix unsafe using smp_processor_id() in preemptible

drivers/scsi/mpt2sas/mpt2sas_base.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1792,7 +1792,7 @@ static inline void _base_writeq(__u64 b, volatile void __iomem *addr,
		static inline u8
		_base_get_msix_index(struct MPT2SAS_ADAPTER *ioc)
		{
		return ioc->cpu_msix_table[smp_processor_id()];
		return ioc->cpu_msix_table[raw_smp_processor_id()];
		}

		/**

drivers/scsi/scsi.c

+1 −3

Original line number	Diff line number	Diff line
		@@ -90,11 +90,9 @@ unsigned int scsi_logging_level;
		EXPORT_SYMBOL(scsi_logging_level);
		#endif

		#if IS_ENABLED(CONFIG_PM) \|\| IS_ENABLED(CONFIG_BLK_DEV_SD)
		/* sd and scsi_pm need to coordinate flushing async actions */
		/* sd, scsi core and power management need to coordinate flushing async actions */
		LIST_HEAD(scsi_sd_probe_domain);
		EXPORT_SYMBOL(scsi_sd_probe_domain);
		#endif

		/* NB: These are exposed through /proc/scsi/scsi and form part of the ABI.
		* You may not alter any existing entry (although adding new ones is

Admin message