summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-05-28 21:56:10 +0200
committerGitHub <noreply@github.com>2024-05-28 21:56:10 +0200
commit35dd8ae6522c781044533e02b275dfbacca62a68 (patch)
treefb2eb69c0cffbe3c50dbeafc27fc9aca1ba010c8
parent1f7bb741aab73072e03d72d1fead0e2294c43845 (diff)
parentfad19934f90e7c94d2c4bb79358d16676a64ab27 (diff)
downloadvyos-build-35dd8ae6522c781044533e02b275dfbacca62a68.tar.gz
vyos-build-35dd8ae6522c781044533e02b275dfbacca62a68.zip
Merge pull request #647 from vyos/mergify/bp/sagitta/pr-6451.4.0
T6406: enables CONFIG_CFS_BANDWIDTH for cpu cgroup limits (backport #645)
-rw-r--r--packages/linux-kernel/arch/arm64/configs/vyos_defconfig1
-rw-r--r--packages/linux-kernel/arch/x86/configs/vyos_defconfig1
2 files changed, 2 insertions, 0 deletions
diff --git a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
index a0065740..11abca82 100644
--- a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
+++ b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
@@ -173,6 +173,7 @@ CONFIG_MEMCG=y
CONFIG_MEMCG_KMEM=y
# CONFIG_BLK_CGROUP is not set
CONFIG_CGROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
CONFIG_SCHED_MM_CID=y
CONFIG_CGROUP_PIDS=y
# CONFIG_CGROUP_RDMA is not set
diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig
index bf0f6cd3..fbf0c88d 100644
--- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig
+++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig
@@ -193,6 +193,7 @@ CONFIG_MEMCG=y
CONFIG_MEMCG_KMEM=y
# CONFIG_BLK_CGROUP is not set
CONFIG_CGROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
CONFIG_SCHED_MM_CID=y
CONFIG_CGROUP_PIDS=y
# CONFIG_CGROUP_RDMA is not set