am 99fbb56a: Merge "Don\'t count lowmem mappings as memory used." into mnc-dev

* commit '99fbb56a0ab81ead404480f0c2df529332a93a32':
  Don't count lowmem mappings as memory used.
This commit is contained in:
Martijn Coenen
2015-05-26 09:36:25 +00:00
committed by Android Git Automerger

View File

@@ -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;
}