[openwrt/openwrt] kernel: clean-up build-configurable kernel config symbols
LEDE Commits
lede-commits at lists.infradead.org
Thu Jul 30 12:17:57 EDT 2020
dangole pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/d1a8217d87bffa33fd7d4562b3ed2f797c14beaf
commit d1a8217d87bffa33fd7d4562b3ed2f797c14beaf
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Thu Jul 30 16:24:19 2020 +0100
kernel: clean-up build-configurable kernel config symbols
Don't explicitely disable options in target/linux/generic/config-* if
they are already controlled in config/Config-kernel.in.
Add a bunch of new symbols and prepare defaults for using only unified
hierarchy (ie. cgroup2). Update symbol dependencies while at it
Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
config/Config-kernel.in | 49 ++++++++++++++++++++++++++++++++--------
target/linux/generic/config-4.14 | 9 --------
target/linux/generic/config-4.19 | 8 -------
target/linux/generic/config-5.4 | 10 --------
4 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/config/Config-kernel.in b/config/Config-kernel.in
index 301d679e4e..f6464b7574 100644
--- a/config/Config-kernel.in
+++ b/config/Config-kernel.in
@@ -357,6 +357,18 @@ config KERNEL_BLK_DEV_BSG
bool "Compile the kernel with SCSI generic v4 support for any block device"
default n
+config KERNEL_TRANSPARENT_HUGEPAGE
+ bool
+
+config KERNEL_HUGETLBFS
+ bool
+
+config KERNEL_HUGETLB_PAGE
+ bool "Compile the kernel with HugeTLB support"
+ select KERNEL_TRANSPARENT_HUGEPAGE
+ select KERNEL_HUGETLBFS
+ default n
+
config KERNEL_MAGIC_SYSRQ
bool "Compile the kernel with SysRq support"
default y
@@ -551,21 +563,29 @@ if KERNEL_CGROUPS
config KERNEL_FREEZER
bool
- default y if KERNEL_CGROUP_FREEZER
config KERNEL_CGROUP_FREEZER
- bool "Freezer cgroup subsystem"
- default y
+ bool "legacy Freezer cgroup subsystem"
+ default n
+ select KERNEL_FREEZER
help
Provides a way to freeze and unfreeze all tasks in a
cgroup.
+ (legacy cgroup1-only controller, in cgroup2 freezer
+ is integrated in the Memory controller)
config KERNEL_CGROUP_DEVICE
- bool "Device controller for cgroups"
- default y
+ bool "legacy Device controller for cgroups"
+ default n
help
Provides a cgroup implementing whitelists for devices which
a process in the cgroup can mknod or open.
+ (legacy cgroup1-only controller)
+
+ config KERNEL_CGROUP_HUGETLB
+ bool "HugeTLB controller"
+ default y if KERNEL_HUGETLB_PAGE
+ depends on KERNEL_HUGETLB_PAGE
config KERNEL_CGROUP_PIDS
bool "PIDs cgroup subsystem"
@@ -574,6 +594,14 @@ if KERNEL_CGROUPS
Provides enforcement of process number limits in the scope of a
cgroup.
+ config KERNEL_CGROUP_RDMA
+ bool "RDMA controller for cgroups"
+ default y
+
+ config KERNEL_CGROUP_BPF
+ bool "Support for eBPF programs attached to cgroups"
+ default y
+
config KERNEL_CPUSETS
bool "Cpuset support"
default y if !SMALL_FLASH
@@ -609,6 +637,7 @@ if KERNEL_CGROUPS
config KERNEL_MEMCG
bool "Memory Resource Controller for Control Groups"
default y if !SMALL_FLASH
+ select KERNEL_FREEZER
depends on KERNEL_RESOURCE_COUNTERS || !LINUX_3_18
help
Provides a memory resource controller that manages both anonymous
@@ -631,7 +660,7 @@ if KERNEL_CGROUPS
config KERNEL_MEMCG_SWAP
bool "Memory Resource Controller Swap Extension"
- default n
+ default y if !SMALL_FLASH
depends on KERNEL_MEMCG
help
Add swap management feature to memory resource controller. When you
@@ -763,12 +792,12 @@ if KERNEL_CGROUPS
files in a cgroup which can be useful for debugging.
config KERNEL_NET_CLS_CGROUP
- bool "Control Group Classifier"
- default y
+ bool "legacy Control Group Classifier"
+ default n
config KERNEL_CGROUP_NET_PRIO
- bool "Network priority cgroup"
- default y
+ bool "legacy Network priority cgroup"
+ default n
endif
diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14
index 047921b3b1..fa6f239bc5 100644
--- a/target/linux/generic/config-4.14
+++ b/target/linux/generic/config-4.14
@@ -725,13 +725,6 @@ 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_CGROUP_BPF is not set
-# CONFIG_CGROUP_DEBUG is not set
-# CONFIG_CGROUP_HUGETLB is not set
-# CONFIG_CGROUP_NET_CLASSID is not set
-# CONFIG_CGROUP_NET_PRIO is not set
-# CONFIG_CGROUP_RDMA is not set
# CONFIG_CHARGER_BQ2415X is not set
# CONFIG_CHARGER_BQ24190 is not set
# CONFIG_CHARGER_BQ24257 is not set
@@ -1756,7 +1749,6 @@ CONFIG_HPET_MMAP_DEFAULT=y
# CONFIG_HTC_PASIC3 is not set
# CONFIG_HTS221 is not set
# CONFIG_HTU21 is not set
-# CONFIG_HUGETLB_PAGE is not set
# CONFIG_HVC_DCC is not set
# CONFIG_HVC_UDBG is not set
# CONFIG_HWLAT_TRACER is not set
@@ -5132,7 +5124,6 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
# CONFIG_TRACING_EVENTS_GPIO is not set
CONFIG_TRACING_SUPPORT=y
CONFIG_TRAD_SIGNALS=y
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
# CONFIG_TREE_RCU is not set
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_TRIM_UNUSED_KSYMS is not set
diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19
index 172af013db..016c3bc6aa 100644
--- a/target/linux/generic/config-4.19
+++ b/target/linux/generic/config-4.19
@@ -743,12 +743,6 @@ 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_CGROUP_BPF is not set
-# CONFIG_CGROUP_DEBUG is not set
-# CONFIG_CGROUP_NET_CLASSID is not set
-# CONFIG_CGROUP_NET_PRIO is not set
-# CONFIG_CGROUP_RDMA is not set
# CONFIG_CHARGER_ADP5061 is not set
# CONFIG_CHARGER_BQ2415X is not set
# CONFIG_CHARGER_BQ24190 is not set
@@ -1867,7 +1861,6 @@ CONFIG_HPET_MMAP_DEFAULT=y
# CONFIG_HTC_PASIC3 is not set
# CONFIG_HTS221 is not set
# CONFIG_HTU21 is not set
-# CONFIG_HUGETLB_PAGE is not set
# CONFIG_HVC_DCC is not set
# CONFIG_HVC_UDBG is not set
# CONFIG_HWLAT_TRACER is not set
@@ -5403,7 +5396,6 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
# CONFIG_TRACING_EVENTS_GPIO is not set
CONFIG_TRACING_SUPPORT=y
CONFIG_TRAD_SIGNALS=y
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
# CONFIG_TREE_RCU is not set
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_TRIM_UNUSED_KSYMS is not set
diff --git a/target/linux/generic/config-5.4 b/target/linux/generic/config-5.4
index a9d3e6920a..1df08c33d2 100644
--- a/target/linux/generic/config-5.4
+++ b/target/linux/generic/config-5.4
@@ -791,13 +791,6 @@ 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_CGROUP_BPF is not set
-# CONFIG_CGROUP_DEBUG is not set
-# CONFIG_CGROUP_HUGETLB is not set
-# CONFIG_CGROUP_NET_CLASSID is not set
-# CONFIG_CGROUP_NET_PRIO is not set
-# CONFIG_CGROUP_RDMA is not set
# CONFIG_CHARGER_ADP5061 is not set
# CONFIG_CHARGER_BQ2415X is not set
# CONFIG_CHARGER_BQ24190 is not set
@@ -2005,8 +1998,6 @@ CONFIG_HPET_MMAP_DEFAULT=y
# CONFIG_HTC_PASIC3 is not set
# CONFIG_HTS221 is not set
# CONFIG_HTU21 is not set
-# CONFIG_HUGETLBFS is not set
-# CONFIG_HUGETLB_PAGE is not set
# CONFIG_HVC_DCC is not set
# CONFIG_HVC_UDBG is not set
# CONFIG_HWLAT_TRACER is not set
@@ -5763,7 +5754,6 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
# CONFIG_TRACING_EVENTS_GPIO is not set
CONFIG_TRACING_SUPPORT=y
CONFIG_TRAD_SIGNALS=y
-# CONFIG_TRANSPARENT_HUGEPAGE is not set
# CONFIG_TREE_RCU is not set
# CONFIG_TREE_RCU_TRACE is not set
# CONFIG_TRIM_UNUSED_KSYMS is not set
More information about the lede-commits
mailing list