diff options
| author | Christian Breunig <christian@breunig.cc> | 2024-05-27 13:55:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-27 13:55:41 +0200 |
| commit | 1f7bb741aab73072e03d72d1fead0e2294c43845 (patch) | |
| tree | 7781bcc7a3eb29174287e600e93b9352c329afdd | |
| parent | ebacf8daba03aaba241769e26b3e091ef9266f0b (diff) | |
| parent | a6b290b135ab80978cfd9ec219b857fdefeba193 (diff) | |
| download | vyos-build-1f7bb741aab73072e03d72d1fead0e2294c43845.tar.gz vyos-build-1f7bb741aab73072e03d72d1fead0e2294c43845.zip | |
Merge pull request #644 from vyos/mergify/bp/sagitta/pr-643
T6406: enables container cpu limits (backport #643)
| -rw-r--r-- | packages/linux-kernel/arch/arm64/configs/vyos_defconfig | 6 | ||||
| -rw-r--r-- | packages/linux-kernel/arch/x86/configs/vyos_defconfig | 6 |
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 |