diff options
| author | dd <dd@wx.tnyzeq.icu> | 2024-05-29 10:46:33 +0200 |
|---|---|---|
| committer | dd <dd@wx.tnyzeq.icu> | 2024-05-29 10:46:33 +0200 |
| commit | f52e36e619f32e5c7cc536b9398687c8061cb269 (patch) | |
| tree | 5e0d4137029524df7800d9ffb9e29130af3565f2 | |
| parent | af3fc898d9ca2414ee14ec0dcaf3d25ee09d1cb8 (diff) | |
| parent | 35dd8ae6522c781044533e02b275dfbacca62a68 (diff) | |
| download | vyos-build-f52e36e619f32e5c7cc536b9398687c8061cb269.tar.gz vyos-build-f52e36e619f32e5c7cc536b9398687c8061cb269.zip | |
Merge branch vyos:sagitta into sagitta
| -rw-r--r-- | packages/linux-kernel/arch/arm64/configs/vyos_defconfig | 1 | ||||
| -rw-r--r-- | packages/linux-kernel/arch/x86/configs/vyos_defconfig | 1 |
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 |