1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index 675b5e7aba94..5a0800d19970 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -1584,11 +1584,11 @@ megasas_build_ldio_fusion(struct megasas_instance *instance,
                         fp_possible = io_info.fpOkForIo;
         }
 
-        /* Use smp_processor_id() for now until cmd->request->cpu is CPU
+        /* Use raw_smp_processor_id() for now until cmd->request->cpu is CPU
            id by default, not CPU group id, otherwise all MSI-X queues won't
            be utilized */
         cmd->request_desc->SCSIIO.MSIxIndex = instance->msix_vectors ?
-                smp_processor_id() % instance->msix_vectors : 0;
+                raw_smp_processor_id() % instance->msix_vectors : 0;
 
         if (fp_possible) {
                 megasas_set_pd_lba(io_request, scp->cmd_len, &io_info, scp,
@@ -1693,7 +1693,10 @@ megasas_build_dcdb_fusion(struct megasas_instance *instance,
                         << MR_RAID_CTX_RAID_FLAGS_IO_SUB_TYPE_SHIFT;
                 cmd->request_desc->SCSIIO.DevHandle = io_request->DevHandle;
                 cmd->request_desc->SCSIIO.MSIxIndex =
-                        instance->msix_vectors ? smp_processor_id() % instance->msix_vectors : 0;
+                        instance->msix_vectors ?
+                                raw_smp_processor_id() %
+                                        instance->msix_vectors :
+                                0;
                 os_timeout_value = scmd->request->timeout / HZ;
 
                 if (instance->secure_jbod_support &&