summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Vollmar <nvollmar@gmail.com>2024-05-27 13:22:51 +0200
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-05-27 11:23:34 +0000
commita6b290b135ab80978cfd9ec219b857fdefeba193 (patch)
tree7781bcc7a3eb29174287e600e93b9352c329afdd
parentebacf8daba03aaba241769e26b3e091ef9266f0b (diff)
downloadvyos-build-a6b290b135ab80978cfd9ec219b857fdefeba193.tar.gz
vyos-build-a6b290b135ab80978cfd9ec219b857fdefeba193.zip
Kernel: T6406: enables CONFIG_CGROUP_CPUACCT
(cherry picked from commit b809886538eaad66b8756be8f5e758584f88e6a6)
-rw-r--r--packages/linux-kernel/arch/arm64/configs/vyos_defconfig6
-rw-r--r--packages/linux-kernel/arch/x86/configs/vyos_defconfig6
2 files changed, 6 insertions, 6 deletions
diff --git a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
index 019d0283..a0065740 100644
--- a/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
+++ b/packages/linux-kernel/arch/arm64/configs/vyos_defconfig
@@ -172,15 +172,15 @@ CONFIG_PAGE_COUNTER=y
CONFIG_MEMCG=y
CONFIG_MEMCG_KMEM=y
# CONFIG_BLK_CGROUP is not set
-# CONFIG_CGROUP_SCHED is not set
+CONFIG_CGROUP_SCHED=y
CONFIG_SCHED_MM_CID=y
CONFIG_CGROUP_PIDS=y
# CONFIG_CGROUP_RDMA is not set
# CONFIG_CGROUP_FREEZER is not set
# CONFIG_CGROUP_HUGETLB is not set
-# CONFIG_CPUSETS is not set
+CONFIG_CPUSETS=y
# CONFIG_CGROUP_DEVICE is not set
-# CONFIG_CGROUP_CPUACCT is not set
+CONFIG_CGROUP_CPUACCT=y
# CONFIG_CGROUP_PERF is not set
CONFIG_CGROUP_BPF=y
# CONFIG_CGROUP_MISC is not set
diff --git a/packages/linux-kernel/arch/x86/configs/vyos_defconfig b/packages/linux-kernel/arch/x86/configs/vyos_defconfig
index 02af06ee..bf0f6cd3 100644
--- a/packages/linux-kernel/arch/x86/configs/vyos_defconfig
+++ b/packages/linux-kernel/arch/x86/configs/vyos_defconfig
@@ -192,15 +192,15 @@ CONFIG_PAGE_COUNTER=y
CONFIG_MEMCG=y
CONFIG_MEMCG_KMEM=y
# CONFIG_BLK_CGROUP is not set
-# CONFIG_CGROUP_SCHED is not set
+CONFIG_CGROUP_SCHED=y
CONFIG_SCHED_MM_CID=y
CONFIG_CGROUP_PIDS=y
# CONFIG_CGROUP_RDMA is not set
# CONFIG_CGROUP_FREEZER is not set
# CONFIG_CGROUP_HUGETLB is not set
-# CONFIG_CPUSETS is not set
+CONFIG_CPUSETS=y
# CONFIG_CGROUP_DEVICE is not set
-# CONFIG_CGROUP_CPUACCT is not set
+CONFIG_CGROUP_CPUACCT=y
# CONFIG_CGROUP_PERF is not set
CONFIG_CGROUP_BPF=y
# CONFIG_CGROUP_MISC is not set