[OpenWrt-Devel] config: kernel: Fix missing symbol on brcm2708 with CGROUPS
diff mbox series

Message ID 20190110030826.11926-1-cshored@thecshore.com
State Accepted
Delegated to: Hauke Mehrtens
Headers show
Series
  • [OpenWrt-Devel] config: kernel: Fix missing symbol on brcm2708 with CGROUPS
Related show

Commit Message

Daniel Dickinson Jan. 10, 2019, 3:08 a.m. UTC
From: "Daniel F. Dickinson" <cshored@thecshore.com>

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>
---
 config/Config-kernel.in | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

Patch
diff mbox series

diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index f38cc792dd..6b571368f2 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -519,6 +519,23 @@  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"
+			default n if KERNEL_BLK_DEV_THROTTLING
+			default y
+
+		config KERNEL_BLK_DEV_THROTTLING
+			bool "Enable throttling policy"
+			default y if TARGET_brcm2708
+			default n
+
+		config KERNEL_BLK_DEV_THROTTLING_LOW
+			bool "Block throttling .low limit interface support (EXPERIMENTAL)"
+			default n
+	endif
+
 	config KERNEL_DEBUG_BLK_CGROUP
 		bool "Enable Block IO controller debugging"
 		default n