From 9c9790ed4e03cf8028ed1a1146a93e7a059546ac Mon Sep 17 00:00:00 2001 From: li-long315 Date: Fri, 22 Dec 2023 09:09:58 +0800 Subject: [PATCH] enable cgroup_thp_control kernel feature (cherry picked from commit a11b1a07bd4094713d9133ebf04897e4c41de652) --- kernel-5.10.0-aarch64-nestos.config | 1 + kernel-5.10.0-x86_64-nestos.config | 1 + kernel-nestos.spec | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/kernel-5.10.0-aarch64-nestos.config b/kernel-5.10.0-aarch64-nestos.config index bef053f..a5d68de 100644 --- a/kernel-5.10.0-aarch64-nestos.config +++ b/kernel-5.10.0-aarch64-nestos.config @@ -135,6 +135,7 @@ CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y CONFIG_MEMCG_KMEM=y CONFIG_MEMCG_MEMFS_INFO=y +CONFIG_MEMCG_THP=y CONFIG_BLK_CGROUP=y CONFIG_CGROUP_WRITEBACK=y CONFIG_CGROUP_V1_WRITEBACK=y diff --git a/kernel-5.10.0-x86_64-nestos.config b/kernel-5.10.0-x86_64-nestos.config index ba718d5..b6c959e 100644 --- a/kernel-5.10.0-x86_64-nestos.config +++ b/kernel-5.10.0-x86_64-nestos.config @@ -166,6 +166,7 @@ CONFIG_MEMCG=y CONFIG_MEMCG_SWAP=y CONFIG_MEMCG_KMEM=y CONFIG_MEMCG_MEMFS_INFO=y +CONFIG_MEMCG_THP=y CONFIG_BLK_CGROUP=y CONFIG_CGROUP_WRITEBACK=y CONFIG_CGROUP_V1_WRITEBACK=y diff --git a/kernel-nestos.spec b/kernel-nestos.spec index 7e7cc0a..4550de9 100644 --- a/kernel-nestos.spec +++ b/kernel-nestos.spec @@ -13,7 +13,7 @@ %global upstream_sublevel 0 %global devel_release 172 %global maintenance_release .1 -%global pkg_release .1 +%global pkg_release .2 %define with_debuginfo 1 # Do not recompute the build-id of vmlinux in find-debuginfo.sh @@ -976,6 +976,9 @@ fi %endif %changelog +* Tue Dec 21 2023 lilong - 5.10.0-172.1.2 +- enable cgroup_thp_control kernel feature + * Tue Dec 12 2023 chendexi - 5.10.0-172.1.1 - Remove useless commands to fix compilation issues -- Gitee