diff options
author | Laura Abbott <labbott@redhat.com> | 2019-04-01 10:56:13 -0700 |
---|---|---|
committer | Laura Abbott <labbott@redhat.com> | 2019-04-01 10:56:13 -0700 |
commit | 91db362b5ccb3e9c42c5ca212e3c4f8cd74332c2 (patch) | |
tree | 1386e725479f455faedad1ea0f3dc49a8365f9f8 | |
parent | 74b4dcfdb802db22fe4283893fce35d85b09cd81 (diff) | |
download | kernel-91db362b5ccb3e9c42c5ca212e3c4f8cd74332c2.tar.gz kernel-91db362b5ccb3e9c42c5ca212e3c4f8cd74332c2.tar.xz kernel-91db362b5ccb3e9c42c5ca212e3c4f8cd74332c2.zip |
Ensure ioschedulers are built in (rhbz 1690604)
-rw-r--r-- | configs/fedora/generic/CONFIG_IOSCHED_BFQ | 2 | ||||
-rw-r--r-- | configs/fedora/generic/CONFIG_MQ_IOSCHED_KYBER | 2 | ||||
-rw-r--r-- | kernel-aarch64-debug.config | 4 | ||||
-rw-r--r-- | kernel-aarch64.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-debug.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-lpae-debug.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl-lpae.config | 4 | ||||
-rw-r--r-- | kernel-armv7hl.config | 4 | ||||
-rw-r--r-- | kernel-i686-debug.config | 4 | ||||
-rw-r--r-- | kernel-i686.config | 4 | ||||
-rw-r--r-- | kernel-ppc64le-debug.config | 4 | ||||
-rw-r--r-- | kernel-ppc64le.config | 4 | ||||
-rw-r--r-- | kernel-s390x-debug.config | 4 | ||||
-rw-r--r-- | kernel-s390x.config | 4 | ||||
-rw-r--r-- | kernel-x86_64-debug.config | 4 | ||||
-rw-r--r-- | kernel-x86_64.config | 4 | ||||
-rw-r--r-- | kernel.spec | 3 |
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 1ef3ef510..948d619d9 100644 --- a/kernel-aarch64-debug.config +++ b/kernel-aarch64-debug.config @@ -2511,7 +2511,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 @@ -3452,7 +3452,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 0989c243c..96c01a15e 100644 --- a/kernel-aarch64.config +++ b/kernel-aarch64.config @@ -2495,7 +2495,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 @@ -3432,7 +3432,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 4256b86f8..89deaad5a 100644 --- a/kernel-armv7hl-debug.config +++ b/kernel-armv7hl-debug.config @@ -2559,7 +2559,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 @@ -3540,7 +3540,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 c17f3f5b4..4c24692a7 100644 --- a/kernel-armv7hl-lpae-debug.config +++ b/kernel-armv7hl-lpae-debug.config @@ -2461,7 +2461,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 @@ -3418,7 +3418,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 a48379654..727056fe7 100644 --- a/kernel-armv7hl-lpae.config +++ b/kernel-armv7hl-lpae.config @@ -2446,7 +2446,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 @@ -3399,7 +3399,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 430235c56..c9f90d36c 100644 --- a/kernel-armv7hl.config +++ b/kernel-armv7hl.config @@ -2544,7 +2544,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 @@ -3521,7 +3521,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 b1402dfdd..9c0b17f5b 100644 --- a/kernel-i686-debug.config +++ b/kernel-i686-debug.config @@ -2304,7 +2304,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 @@ -3220,7 +3220,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 c7240332a..3ae262491 100644 --- a/kernel-i686.config +++ b/kernel-i686.config @@ -2287,7 +2287,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 @@ -3201,7 +3201,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 5b9b68f07..328ac18d2 100644 --- a/kernel-ppc64le-debug.config +++ b/kernel-ppc64le-debug.config @@ -2075,7 +2075,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 @@ -2959,7 +2959,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 97b21565e..2eb7ac949 100644 --- a/kernel-ppc64le.config +++ b/kernel-ppc64le.config @@ -2058,7 +2058,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 @@ -2938,7 +2938,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 c978c1bae..f175bd115 100644 --- a/kernel-s390x-debug.config +++ b/kernel-s390x-debug.config @@ -2054,7 +2054,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 @@ -2933,7 +2933,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 4dd57ce6c..c401340cf 100644 --- a/kernel-s390x.config +++ b/kernel-s390x.config @@ -2037,7 +2037,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 @@ -2912,7 +2912,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 e354f55f2..072e8fc8d 100644 --- a/kernel-x86_64-debug.config +++ b/kernel-x86_64-debug.config @@ -2348,7 +2348,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 @@ -3256,7 +3256,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 16625c7f5..1f85a3d02 100644 --- a/kernel-x86_64.config +++ b/kernel-x86_64.config @@ -2331,7 +2331,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 @@ -3237,7 +3237,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 4412e7a1a..c2fbf0e6b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -1898,6 +1898,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-300 - Linux v5.0.5 |