Disable pm on runtime.

	Hi,

	I hit issues booting my laptop when running on battery thanks to commit 

765e40b675a9566459ddcb8358ad16f3b8344bbe given that I don't have any ssd/nvme on it. Given that I decided to disable the option to default scsi to multiqueue, but still my booting issues persist. For a while I was reverting this patch successfully but nowadays that is not anymore possible. Would it be possible to accept some patch like the one attached to ease this situation?

Thanks!

José Pekkarinen.

From 05ca41296d7c4c2494ac08c94ad5539914e5131a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pekkarinen?= <[email protected]>
Date: Mon, 18 Dec 2017 14:52:12 +0200
Subject: [PATCH] Disable pm only when scsi mq is default by config.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 block/blk-core.c | 2 ++
 1 file changed, 2 insertions(+)

index 33ee583cfe45..68183bc5933f 100644
@@ -3440,9 +3440,11 @@ EXPORT_SYMBOL(blk_finish_plug);
  */
 void blk_pm_runtime_init(struct request_queue *q, struct device *dev)
 {
+#ifdef CONFIG_SCSI_MQ_DEFAULT
 	/* not support for RQF_PM and ->rpm_status in blk-mq yet */
 	if (q->mq_ops)
 		return;
+#endif
 
 	q->dev = dev;
 	q->rpm_status = RPM_ACTIVE;

2.13.6