aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorT.J. Mercier <tjmercier@google.com>2023-11-06 23:22:20 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-11-06 23:22:20 +0000
commit092c1d13b12ae9e78f5d2a9a7329ffc4deb505a8 (patch)
treeacfe122497b90ac16f4805a082ffd845b1bd17d3
parent54b91ae428f2618817810702c62900a1c2bd2d67 (diff)
parent29def1fcfcd78d522d091c647d768c7883d233a0 (diff)
downloadlmkd-092c1d13b12ae9e78f5d2a9a7329ffc4deb505a8.tar.gz
Merge "Use correct language for cgroups" into main am: e2288909ab am: 5789f8506a am: 29def1fcfc
Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2808358 Change-Id: I3e35a799bcb46c8398e3dc5f79373bb910baa4b5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--lmkd.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/lmkd.cpp b/lmkd.cpp
index 1e8746b..1e4d952 100644
--- a/lmkd.cpp
+++ b/lmkd.cpp
@@ -3218,7 +3218,7 @@ static MemcgVersion __memcg_version() {
if (!CgroupGetControllerPath("memory", &memcg_path)) {
return MemcgVersion::kNotFound;
}
- return CgroupGetControllerPath(CGROUPV2_CONTROLLER_NAME, &cgroupv2_path) &&
+ return CgroupGetControllerPath(CGROUPV2_HIERARCHY_NAME, &cgroupv2_path) &&
cgroupv2_path == memcg_path
? MemcgVersion::kV2
: MemcgVersion::kV1;