aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorDaniel F. Dickinson <cshored@thecshore.com>2019-01-09 22:08:26 -0500
committerHauke Mehrtens <hauke@hauke-m.de>2019-02-17 18:22:40 +0100
commitda50f027f04e52b152c6e197d2d4a70330669a36 (patch)
tree0905382cbb8c3c4fd32c7beb9079e158e2b43bcc /config
parent319c5d7c49503d1afbfb3164b18cf966e11fac6a (diff)
downloadupstream-da50f027f04e52b152c6e197d2d4a70330669a36.tar.gz
upstream-da50f027f04e52b152c6e197d2d4a70330669a36.tar.bz2
upstream-da50f027f04e52b152c6e197d2d4a70330669a36.zip
config: kernel: Fix missing symbol on brcm2708 with CGROUPS
When CGROUP block io is enabled a new symbol is exposed and needs to be set or unset else kernel oldconfig hangs waiting for input during normal OpenWrt builds. Therefore add sane defaults for this symbol in that case. Also, the defaults brcm2708 are different than generic defaults because the platform's defconfig enables BLK_DEV_THROTTLING by default (in defconfig config from the patches used to match upstream's kernel, not in OpenWrt config-4.xx). Signed-off-by: Daniel F. Dickinson <cshored@thecshore.com> [make KERNEL_BLK_DEV_THROTTLING_LOW depend on KERNEL_BLK_DEV_THROTTLING] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'config')
-rw-r--r--config/Config-kernel.in14
1 files changed, 14 insertions, 0 deletions
diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index f38cc792dd..874b153b45 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -519,6 +519,20 @@ if KERNEL_CGROUPS
CONFIG_CFQ_GROUP_IOSCHED=y; for enabling throttling policy, set
CONFIG_BLK_DEV_THROTTLING=y.
+ if KERNEL_BLK_CGROUP
+
+ config KERNEL_CFQ_GROUP_IOSCHED
+ bool "Proportional weight of disk bandwidth in CFQ"
+
+ config KERNEL_BLK_DEV_THROTTLING
+ bool "Enable throttling policy"
+ default y if TARGET_brcm2708
+
+ config KERNEL_BLK_DEV_THROTTLING_LOW
+ bool "Block throttling .low limit interface support (EXPERIMENTAL)"
+ depends on KERNEL_BLK_DEV_THROTTLING
+ endif
+
config KERNEL_DEBUG_BLK_CGROUP
bool "Enable Block IO controller debugging"
default n