wenchao-hao
/
lmkd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Use correct language for cgroups" into main am: e2288909ab 

Original change: https://android-review.googlesource.com/c/platform/system/memory/lmkd/+/2808358

Change-Id: I9508fa6a0eef439cab54667a10be5bed3e52ee2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
T.J. Mercier 2023-11-06 22:11:32 +00:00 committed by Automerger Merge Worker
parent 5cb0c07d1e e2288909ab
commit 6ed1a5b77e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lmkd.cpp
View File

@ -3218,7 +3218,7 @@ static MemcgVersion __memcg_version() {
if (!CgroupGetControllerPath("memory", &memcg_path)) { if (!CgroupGetControllerPath("memory", &memcg_path)) {
return MemcgVersion::kNotFound; return MemcgVersion::kNotFound;
} }
return CgroupGetControllerPath(CGROUPV2_CONTROLLER_NAME, &cgroupv2_path) && return CgroupGetControllerPath(CGROUPV2_HIERARCHY_NAME, &cgroupv2_path) &&
cgroupv2_path == memcg_path cgroupv2_path == memcg_path
? MemcgVersion::kV2 ? MemcgVersion::kV2
: MemcgVersion::kV1; : MemcgVersion::kV1;