From: nagalakshmi.nandigama@lsi.com Date: Tue, 17 Apr 2012 05:55:04 +0000 (+0530) Subject: mpt2sas: Fix unsafe using smp_processor_id() in preemptible X-Git-Tag: v3.2.21~34 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b3f92ffcf17680fc2064962c41debb424a2be403;p=karo-tx-linux.git mpt2sas: Fix unsafe using smp_processor_id() in preemptible commit a2c658505bf5c75516ee0a79287223e86a2474af upstream. When CONFIG_DEBUG_PREEMPT is enabled, bug is observed in the smp_processor_id(). This is because smp_processor_id() is not called in preempt safe condition. To fix this issue, use raw_smp_processor_id instead of smp_processor_id. Signed-off-by: Nagalakshmi Nandigama Signed-off-by: James Bottomley Signed-off-by: Ben Hutchings --- diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c b/drivers/scsi/mpt2sas/mpt2sas_base.c index ac336e13e564..e903077b1a11 100644 --- a/drivers/scsi/mpt2sas/mpt2sas_base.c +++ b/drivers/scsi/mpt2sas/mpt2sas_base.c @@ -1739,7 +1739,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()]; } /**