--- drivers/scsi/hpsa.c	2016-04-20 03:44:02.000000000 -0300
+++ /tmp/hpsa_smp.c	2016-04-28 16:04:19.268947035 -0300
@@ -994,7 +994,7 @@
 	 * processor.  This seems to give the best I/O throughput.
 	 */
 	if (likely(reply_queue == DEFAULT_REPLY_QUEUE))
-		cp->ReplyQueue = smp_processor_id() % h->nreply_queues;
+		cp->ReplyQueue = raw_smp_processor_id() % h->nreply_queues;
 	else
 		cp->ReplyQueue = reply_queue % h->nreply_queues;
 	/*
@@ -1018,7 +1018,7 @@
 	 * processor.  This seems to give the best I/O throughput.
 	 */
 	if (likely(reply_queue == DEFAULT_REPLY_QUEUE))
-		cp->reply_queue = smp_processor_id() % h->nreply_queues;
+		cp->reply_queue = raw_smp_processor_id() % h->nreply_queues;
 	else
 		cp->reply_queue = reply_queue % h->nreply_queues;
 	/* Set the bits in the address sent down to include:
@@ -1040,7 +1040,7 @@
 	 * processor.  This seems to give the best I/O throughput.
 	 */
 	if (likely(reply_queue == DEFAULT_REPLY_QUEUE))
-		cp->reply_queue = smp_processor_id() % h->nreply_queues;
+		cp->reply_queue = raw_smp_processor_id() % h->nreply_queues;
 	else
 		cp->reply_queue = reply_queue % h->nreply_queues;
 	/*