Merge "Don't count lowmem mappings as memory used." into mnc-dev

2015-05-26 08:11:26 +00:00
parent 912696e797 ab3576e58a
commit 99fbb56a0a
1 changed files with 2 additions and 2 deletions
--- a/core/jni/android_os_Debug.cpp
+++ b/core/jni/android_os_Debug.cpp
@@ -580,8 +580,8 @@ static long get_allocated_vmalloc_memory() {
            break;
        }

-        if (!strstr(line, "ioremap")) {
-            // Ignore ioremap regions, since they don't actually consume memory
+        if (!strstr(line, "ioremap") && !strstr(line, "map_lowmem")) {
+            // Ignore ioremap and map_lowmem regions, since they don't actually consume memory
            if (sscanf(line, "%*x-%*x %ld", &size) == 1) {
                vmalloc_allocated_size += size;
            }