From 6e1238318457435527cbfe0a633c14baca6fe131 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 17 Nov 2022 09:10:50 +0100
Subject: [PATCH] main/linux-lts: enable memcg and cpuset for virt x86

---
 main/linux-lts/APKBUILD        | 2 +-
 main/linux-lts/virt.x86.config | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD
index 14d676cb1f2f..52e8fb717833 100644
--- a/main/linux-lts/APKBUILD
+++ b/main/linux-lts/APKBUILD
@@ -327,7 +327,7 @@ bd6b3e68cc1bf41405392b8bc856309ed672d5baee631a26bdd0f120fdb05eaa67308cd546c70360
 77a6a1503f312a5fc5aa27e4e45b1fa1890cec367b4316480928f8f03a8b5940c4e728c51efce26aa53c018b2f1189a42959ede9fb88178a183a30d011e35265  virt.aarch64.config
 f11cb3daac5d59b7bcbc83b98160edf7c42644a2d3cec751f406cef97017501218aed0bdd680e2521a5f86c997535a8bad767bcae594764b4e02ef0babc1e616  virt.armv7.config
 d01617e76b585eca0a116ca3ef521e9ac75a51f9d4e883463d2183891e144bbde1b400336cdb370bd75211739fc2fa8e202e5c02ce674c0f290ab76ff2029d62  virt.ppc64le.config
-23c06cc17eef57ae84d7f7545011963e319d2f1ede51b8d4d570751ba0db2b13afb61ce68dcb898986cef9f82dff4b181a0657f41ceb6a741ad5121b5dbb2302  virt.x86.config
+31c701e6f29a9f3d93eea27cb35dd0d799ed43a759f3b5edfe8e24332da958bc4bc347e35f686aeddde2e7a489f9139465af87082adbc08abe880a3ac2d40ec1  virt.x86.config
 3bb6315326947f7eeaaea55854f2129a8d646ad18d1e2b3b199252e68e5ae61cf89d1e0b3cfe270e66167675729ef2f717099acc6e2a37a6d7e78dd03d5fcb4f  virt.x86_64.config
 3d8fcb4f0e236a91f79df0f9ebdda8e7e5d85b9c750af5b93a7ba58a2961521f25eee2e71580b10d901aad481c55bd987d52299b62708006f8b64c4b497d7277  patch-5.15.78.xz
 "
diff --git a/main/linux-lts/virt.x86.config b/main/linux-lts/virt.x86.config
index 33be5892328f..b2f080a6a17b 100644
--- a/main/linux-lts/virt.x86.config
+++ b/main/linux-lts/virt.x86.config
@@ -19,9 +19,11 @@ CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_IKCONFIG=m
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
+CONFIG_MEMCG=y
 CONFIG_BLK_CGROUP=y
 CONFIG_CGROUP_PIDS=y
 CONFIG_CGROUP_FREEZER=y
+CONFIG_CPUSETS=y
 CONFIG_CGROUP_DEVICE=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_CGROUP_BPF=y
-- 
GitLab