1 files changed, 27 insertions, 31 deletions

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 24ccab51085f..3603270cb82d 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -572,37 +572,33 @@ struct request_queue {
         u64                     write_hints[BLK_MAX_WRITE_HINTS];
 };
 
-#define QUEUE_FLAG_STOPPED      1       /* queue is stopped */
-#define QUEUE_FLAG_DYING        2       /* queue being torn down */
-#define QUEUE_FLAG_BIDI         4       /* queue supports bidi requests */
-#define QUEUE_FLAG_NOMERGES     5       /* disable merge attempts */
-#define QUEUE_FLAG_SAME_COMP    6       /* complete on same CPU-group */
-#define QUEUE_FLAG_FAIL_IO      7       /* fake timeout */
-#define QUEUE_FLAG_NONROT       9       /* non-rotational device (SSD) */
-#define QUEUE_FLAG_VIRT        QUEUE_FLAG_NONROT /* paravirt device */
-#define QUEUE_FLAG_IO_STAT     10       /* do disk/partitions IO accounting */
-#define QUEUE_FLAG_DISCARD     11       /* supports DISCARD */
-#define QUEUE_FLAG_NOXMERGES   12       /* No extended merges */
-#define QUEUE_FLAG_ADD_RANDOM  13       /* Contributes to random pool */
-#define QUEUE_FLAG_SECERASE    14       /* supports secure erase */
-#define QUEUE_FLAG_SAME_FORCE  15       /* force complete on same CPU */
-#define QUEUE_FLAG_DEAD        16       /* queue tear-down finished */
-#define QUEUE_FLAG_INIT_DONE   17       /* queue is initialized */
-#define QUEUE_FLAG_NO_SG_MERGE 18       /* don't attempt to merge SG segments*/
-#define QUEUE_FLAG_POLL        19       /* IO polling enabled if set */
-#define QUEUE_FLAG_WC          20       /* Write back caching */
-#define QUEUE_FLAG_FUA         21       /* device supports FUA writes */
-#define QUEUE_FLAG_DAX         23       /* device supports DAX */
-#define QUEUE_FLAG_STATS       24       /* track IO start and completion times */
-#define QUEUE_FLAG_POLL_STATS  25       /* collecting stats for hybrid polling */
-#define QUEUE_FLAG_REGISTERED  26       /* queue has been registered to a disk */
-#define QUEUE_FLAG_SCSI_PASSTHROUGH 27  /* queue supports SCSI commands */
-#define QUEUE_FLAG_QUIESCED    28       /* queue has been quiesced */
-#define QUEUE_FLAG_PCI_P2PDMA  29       /* device supports PCI p2p requests */
-
-#define QUEUE_FLAG_DEFAULT      ((1 << QUEUE_FLAG_IO_STAT) |            \
-                                 (1 << QUEUE_FLAG_SAME_COMP)    |       \
-                                 (1 << QUEUE_FLAG_ADD_RANDOM))
+#define QUEUE_FLAG_STOPPED      0       /* queue is stopped */
+#define QUEUE_FLAG_DYING        1       /* queue being torn down */
+#define QUEUE_FLAG_BIDI         2       /* queue supports bidi requests */
+#define QUEUE_FLAG_NOMERGES     3       /* disable merge attempts */
+#define QUEUE_FLAG_SAME_COMP    4       /* complete on same CPU-group */
+#define QUEUE_FLAG_FAIL_IO      5       /* fake timeout */
+#define QUEUE_FLAG_NONROT       6       /* non-rotational device (SSD) */
+#define QUEUE_FLAG_VIRT         QUEUE_FLAG_NONROT /* paravirt device */
+#define QUEUE_FLAG_IO_STAT      7       /* do disk/partitions IO accounting */
+#define QUEUE_FLAG_DISCARD      8       /* supports DISCARD */
+#define QUEUE_FLAG_NOXMERGES    9       /* No extended merges */
+#define QUEUE_FLAG_ADD_RANDOM   10      /* Contributes to random pool */
+#define QUEUE_FLAG_SECERASE     11      /* supports secure erase */
+#define QUEUE_FLAG_SAME_FORCE   12      /* force complete on same CPU */
+#define QUEUE_FLAG_DEAD         13      /* queue tear-down finished */
+#define QUEUE_FLAG_INIT_DONE    14      /* queue is initialized */
+#define QUEUE_FLAG_NO_SG_MERGE  15      /* don't attempt to merge SG segments*/
+#define QUEUE_FLAG_POLL         16      /* IO polling enabled if set */
+#define QUEUE_FLAG_WC           17      /* Write back caching */
+#define QUEUE_FLAG_FUA          18      /* device supports FUA writes */
+#define QUEUE_FLAG_DAX          19      /* device supports DAX */
+#define QUEUE_FLAG_STATS        20      /* track IO start and completion times */
+#define QUEUE_FLAG_POLL_STATS   21      /* collecting stats for hybrid polling */
+#define QUEUE_FLAG_REGISTERED   22      /* queue has been registered to a disk */
+#define QUEUE_FLAG_SCSI_PASSTHROUGH 23  /* queue supports SCSI commands */
+#define QUEUE_FLAG_QUIESCED     24      /* queue has been quiesced */
+#define QUEUE_FLAG_PCI_P2PDMA   25      /* device supports PCI p2p requests */
 
 #define QUEUE_FLAG_MQ_DEFAULT   ((1 << QUEUE_FLAG_IO_STAT) |            \
                                  (1 << QUEUE_FLAG_SAME_COMP))