Ensure ioschedulers are built in (rhbz 1690604)

17 files changed, 33 insertions, 30 deletions

diff --git a/configs/fedora/generic/CONFIG_IOSCHED_BFQ b/configs/fedora/generic/CONFIG_IOSCHED_BFQ
index 3023fb0b5..784fa4506 100644
--- a/configs/fedora/generic/CONFIG_IOSCHED_BFQ
+++ b/configs/fedora/generic/CONFIG_IOSCHED_BFQ
@@ -1 +1 @@
-CONFIG_IOSCHED_BFQ=m
+CONFIG_IOSCHED_BFQ=y
diff --git a/configs/fedora/generic/CONFIG_MQ_IOSCHED_KYBER b/configs/fedora/generic/CONFIG_MQ_IOSCHED_KYBER
index 939264da2..16623d2a0 100644
--- a/configs/fedora/generic/CONFIG_MQ_IOSCHED_KYBER
+++ b/configs/fedora/generic/CONFIG_MQ_IOSCHED_KYBER
@@ -1 +1 @@
-CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_MQ_IOSCHED_KYBER=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index c046da433..fcef29b7a 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -2486,7 +2486,7 @@ CONFIG_IOMMU_DMA=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 CONFIG_IOMMU_SUPPORT=y
-CONFIG_IOSCHED_BFQ=m
+CONFIG_IOSCHED_BFQ=y
 CONFIG_IO_STRICT_DEVMEM=y
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_IPTABLES=m
@@ -3424,7 +3424,7 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_MQ_IOSCHED_KYBER=y
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
 # CONFIG_MS_BLOCK is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 2e26dbb02..af240003c 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -2470,7 +2470,7 @@ CONFIG_IOMMU_DMA=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 CONFIG_IOMMU_SUPPORT=y
-CONFIG_IOSCHED_BFQ=m
+CONFIG_IOSCHED_BFQ=y
 CONFIG_IO_STRICT_DEVMEM=y
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_IPTABLES=m
@@ -3404,7 +3404,7 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_MQ_IOSCHED_KYBER=y
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
 # CONFIG_MS_BLOCK is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 93f1873ae..2c63a9317 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -2557,7 +2557,7 @@ CONFIG_IOMMU_DMA=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 CONFIG_IOMMU_SUPPORT=y
-CONFIG_IOSCHED_BFQ=m
+CONFIG_IOSCHED_BFQ=y
 CONFIG_IO_STRICT_DEVMEM=y
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_IPTABLES=m
@@ -3538,7 +3538,7 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_MQ_IOSCHED_KYBER=y
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
 # CONFIG_MS_BLOCK is not set
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index edf190d42..52563b46c 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -2444,7 +2444,7 @@ CONFIG_IOMMU_DMA=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 CONFIG_IOMMU_SUPPORT=y
-CONFIG_IOSCHED_BFQ=m
+CONFIG_IOSCHED_BFQ=y
 CONFIG_IO_STRICT_DEVMEM=y
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_IPTABLES=m
@@ -3398,7 +3398,7 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_MQ_IOSCHED_KYBER=y
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
 # CONFIG_MS_BLOCK is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 40e864ada..8f24e9aba 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -2429,7 +2429,7 @@ CONFIG_IOMMU_DMA=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 CONFIG_IOMMU_SUPPORT=y
-CONFIG_IOSCHED_BFQ=m
+CONFIG_IOSCHED_BFQ=y
 CONFIG_IO_STRICT_DEVMEM=y
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_IPTABLES=m
@@ -3379,7 +3379,7 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_MQ_IOSCHED_KYBER=y
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
 # CONFIG_MS_BLOCK is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 5fafa76cb..abaddabb8 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -2542,7 +2542,7 @@ CONFIG_IOMMU_DMA=y
 # CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 CONFIG_IOMMU_IO_PGTABLE_LPAE=y
 CONFIG_IOMMU_SUPPORT=y
-CONFIG_IOSCHED_BFQ=m
+CONFIG_IOSCHED_BFQ=y
 CONFIG_IO_STRICT_DEVMEM=y
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_IPTABLES=m
@@ -3519,7 +3519,7 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_MQ_IOSCHED_KYBER=y
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
 # CONFIG_MS_BLOCK is not set
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 856849f46..c0929a18b 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -2305,7 +2305,7 @@ CONFIG_IO_DELAY_0X80=y
 CONFIG_IOMMU_DEBUGFS=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_SUPPORT=y
-CONFIG_IOSCHED_BFQ=m
+CONFIG_IOSCHED_BFQ=y
 # CONFIG_IOSF_MBI_DEBUG is not set
 CONFIG_IOSF_MBI=y
 CONFIG_IO_STRICT_DEVMEM=y
@@ -3224,7 +3224,7 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_MQ_IOSCHED_KYBER=y
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
 # CONFIG_MS_BLOCK is not set
diff --git a/kernel-i686.config b/kernel-i686.config
index d319760f4..654d5af2c 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -2288,7 +2288,7 @@ CONFIG_IO_DELAY_0X80=y
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_SUPPORT=y
-CONFIG_IOSCHED_BFQ=m
+CONFIG_IOSCHED_BFQ=y
 # CONFIG_IOSF_MBI_DEBUG is not set
 CONFIG_IOSF_MBI=y
 CONFIG_IO_STRICT_DEVMEM=y
@@ -3205,7 +3205,7 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_MQ_IOSCHED_KYBER=y
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
 # CONFIG_MS_BLOCK is not set
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index de80bbeac..04730b328 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2108,7 +2108,7 @@ CONFIG_IO_EVENT_IRQ=y
 CONFIG_IOMMU_DEBUGFS=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_SUPPORT=y
-CONFIG_IOSCHED_BFQ=m
+CONFIG_IOSCHED_BFQ=y
 CONFIG_IO_STRICT_DEVMEM=y
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_IPTABLES=m
@@ -3003,7 +3003,7 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_MQ_IOSCHED_KYBER=y
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
 # CONFIG_MS_BLOCK is not set
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index e9fea2754..2ad4f5d31 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2091,7 +2091,7 @@ CONFIG_IO_EVENT_IRQ=y
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_SUPPORT=y
-CONFIG_IOSCHED_BFQ=m
+CONFIG_IOSCHED_BFQ=y
 CONFIG_IO_STRICT_DEVMEM=y
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_IPTABLES=m
@@ -2982,7 +2982,7 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_MQ_IOSCHED_KYBER=y
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
 # CONFIG_MS_BLOCK is not set
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 5d8afb81a..757fe4856 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2055,7 +2055,7 @@ CONFIG_IO_DELAY_0X80=y
 CONFIG_IOMMU_DEBUGFS=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_SUPPORT=y
-CONFIG_IOSCHED_BFQ=m
+CONFIG_IOSCHED_BFQ=y
 CONFIG_IO_STRICT_DEVMEM=y
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_IPTABLES=m
@@ -2937,7 +2937,7 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_MQ_IOSCHED_KYBER=y
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
 # CONFIG_MS_BLOCK is not set
diff --git a/kernel-s390x.config b/kernel-s390x.config
index d905634e1..6f9e0aedf 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2038,7 +2038,7 @@ CONFIG_IO_DELAY_0X80=y
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_SUPPORT=y
-CONFIG_IOSCHED_BFQ=m
+CONFIG_IOSCHED_BFQ=y
 CONFIG_IO_STRICT_DEVMEM=y
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_IPTABLES=m
@@ -2916,7 +2916,7 @@ CONFIG_MPLS_IPTUNNEL=m
 CONFIG_MPLS_ROUTING=m
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_MQ_IOSCHED_KYBER=y
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
 # CONFIG_MS_BLOCK is not set
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 38e5ada7a..14343e970 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -2349,7 +2349,7 @@ CONFIG_IO_DELAY_0X80=y
 CONFIG_IOMMU_DEBUGFS=y
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_SUPPORT=y
-CONFIG_IOSCHED_BFQ=m
+CONFIG_IOSCHED_BFQ=y
 # CONFIG_IOSF_MBI_DEBUG is not set
 CONFIG_IOSF_MBI=y
 CONFIG_IO_STRICT_DEVMEM=y
@@ -3260,7 +3260,7 @@ CONFIG_MPLS_ROUTING=m
 # CONFIG_MPSC is not set
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_MQ_IOSCHED_KYBER=y
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
 # CONFIG_MS_BLOCK is not set
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index f9ebd56f4..97823e12b 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -2332,7 +2332,7 @@ CONFIG_IO_DELAY_0X80=y
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
 CONFIG_IOMMU_SUPPORT=y
-CONFIG_IOSCHED_BFQ=m
+CONFIG_IOSCHED_BFQ=y
 # CONFIG_IOSF_MBI_DEBUG is not set
 CONFIG_IOSF_MBI=y
 CONFIG_IO_STRICT_DEVMEM=y
@@ -3241,7 +3241,7 @@ CONFIG_MPLS_ROUTING=m
 # CONFIG_MPSC is not set
 CONFIG_MPU3050_I2C=m
 CONFIG_MQ_IOSCHED_DEADLINE=y
-CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_MQ_IOSCHED_KYBER=y
 # CONFIG_MS5611 is not set
 # CONFIG_MS5637 is not set
 # CONFIG_MS_BLOCK is not set
diff --git a/kernel.spec b/kernel.spec
index 2d9fb3050..13e2f8676 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -1906,6 +1906,9 @@ fi
 #
 #
 %changelog
+* Mon Apr 01 2019 Laura Abbott <labbott@redhat.com>
+- Ensure ioschedulers are built in (rhbz 1690604)
+
 * Wed Mar 27 2019 Laura Abbott <labbott@redhat.com> - 5.0.5-100
 - Linux v5.0.5