From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Wed, 12 Aug 2020 11:53:47 +0000 (+0200)
Subject: kernel: add CGROUPS and IOSCHED_BFQ back to config
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=92b4f16babfa9127a4dde9e220a4e28f9520a053;p=openwrt%2Fstaging%2Fjogo.git

kernel: add CGROUPS and IOSCHED_BFQ back to config

After those symbols have been removed from generic kernel config,
they were added to the target config during every kernel config
refresh. As that's not desirable, add them back to the generic
config.

Fixes: d1a8217d87bf ("kernel: clean-up build-configurable kernel config symbols")
Fixes: cfe235c43686 ("kernel: modules: add package kmod-iosched-bfq")

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---

diff --git a/target/linux/bcm53xx/config-5.4 b/target/linux/bcm53xx/config-5.4
index ea10eba992..eacfcb620e 100644
--- a/target/linux/bcm53xx/config-5.4
+++ b/target/linux/bcm53xx/config-5.4
@@ -87,7 +87,6 @@ CONFIG_BOUNCE=y
 CONFIG_BROADCOM_PHY=y
 CONFIG_CACHE_L2X0=y
 CONFIG_CC_HAS_KASAN_GENERIC=y
-# CONFIG_CGROUPS is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y
 CONFIG_CLKSRC_MMIO=y
diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14
index 5f2360734c..6bf7dac5e3 100644
--- a/target/linux/generic/config-4.14
+++ b/target/linux/generic/config-4.14
@@ -725,6 +725,7 @@ CONFIG_CC_STACKPROTECTOR_NONE=y
 # CONFIG_CFG80211 is not set
 # CONFIG_CFG80211_CERTIFICATION_ONUS is not set
 # CONFIG_CFQ_GROUP_IOSCHED is not set
+# CONFIG_CGROUPS is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
 # CONFIG_CHARGER_BQ24257 is not set
@@ -2064,6 +2065,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INV_MPU6050_IIO is not set
 # CONFIG_INV_MPU6050_SPI is not set
 # CONFIG_IOMMU_SUPPORT is not set
+# CONFIG_IOSCHED_BFQ is not set
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_NOOP=y
diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19
index b2762de05c..cb613f6323 100644
--- a/target/linux/generic/config-4.19
+++ b/target/linux/generic/config-4.19
@@ -743,6 +743,7 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CEPH_LIB is not set
 # CONFIG_CFG80211 is not set
 # CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+# CONFIG_CGROUPS is not set
 # CONFIG_CHARGER_ADP5061 is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
@@ -2186,6 +2187,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INV_MPU6050_IIO is not set
 # CONFIG_INV_MPU6050_SPI is not set
 # CONFIG_IOMMU_SUPPORT is not set
+# CONFIG_IOSCHED_BFQ is not set
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_NOOP=y
diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
index 7f39f8f62c..19bde7ed61 100644
--- a/target/linux/generic/config-5.4
+++ b/target/linux/generic/config-5.4
@@ -791,6 +791,7 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CEPH_LIB is not set
 # CONFIG_CFG80211 is not set
 # CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+# CONFIG_CGROUPS is not set
 # CONFIG_CHARGER_ADP5061 is not set
 # CONFIG_CHARGER_BQ2415X is not set
 # CONFIG_CHARGER_BQ24190 is not set
@@ -2345,6 +2346,7 @@ CONFIG_INPUT_MISC=y
 # CONFIG_INV_MPU6050_SPI is not set
 # CONFIG_IOMMU_SUPPORT is not set
 # CONFIG_IONIC is not set
+# CONFIG_IOSCHED_BFQ is not set
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_IOSCHED_DEADLINE=y
 CONFIG_IOSCHED_NOOP=y
diff --git a/target/linux/malta/config-5.4 b/target/linux/malta/config-5.4
index 56336875b6..2b678cead6 100644
--- a/target/linux/malta/config-5.4
+++ b/target/linux/malta/config-5.4
@@ -40,7 +40,6 @@ CONFIG_BOOT_ELF32=y
 CONFIG_BOUNCE=y
 CONFIG_BUILTIN_DTB=y
 CONFIG_CEVT_R4K=y
-# CONFIG_CGROUPS is not set
 CONFIG_CLKBLD_I8253=y
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKEVT_I8253=y