diff options
| author | dbehr@chromium.org <dbehr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-04 04:07:27 +0000 |
|---|---|---|
| committer | dbehr@chromium.org <dbehr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-04 04:07:27 +0000 |
| commit | dc5f8fd28b7c71926ba26b7bb8deedd5bbd32c62 (patch) | |
| tree | 692d500c1cc35eea59e517ff84d6652e2d430be9 /base/process | |
| parent | 2ca28e62b8de70295c8d10118263a3f9c65dc324 (diff) | |
| download | chromium_src-dc5f8fd28b7c71926ba26b7bb8deedd5bbd32c62.zip chromium_src-dc5f8fd28b7c71926ba26b7bb8deedd5bbd32c62.tar.gz chromium_src-dc5f8fd28b7c71926ba26b7bb8deedd5bbd32c62.tar.bz2 | |
Update Mali memory attribute sysfs location
In Chrome OS kernel 3.4 Mali GPU device is located at
/sys/devices/platform/mali.0/
In Kernel 3.8 Mali GPU device is created via device tree and located
at /sys/devices/11800000.mali/
On both versions of the kernel there is also misc device created under
/sys/class/misc/mali0/device that points back to the device directory
where memory attribute resides. Thich change uses this location which
works with both kernel versions.
BUG=268717
TEST=open chrome://discards tab, see Graphics memory over 16MB
Signed-off-by: Dominik Behr <dbehr@chromium.org>
Review URL: https://chromiumcodereview.appspot.com/23146003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221142 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process')
| -rw-r--r-- | base/process/process_metrics_linux.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/process/process_metrics_linux.cc b/base/process/process_metrics_linux.cc index eba97bb..d248361 100644 --- a/base/process/process_metrics_linux.cc +++ b/base/process/process_metrics_linux.cc @@ -595,7 +595,7 @@ bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo) { #if defined(ARCH_CPU_ARM_FAMILY) // Incorporate Mali graphics memory if present. - FilePath mali_memory_file("/sys/devices/platform/mali.0/memory"); + FilePath mali_memory_file("/sys/class/misc/mali0/device/memory"); std::string mali_memory_data; if (ReadFileToString(mali_memory_file, &mali_memory_data)) { long long mali_size = -1; |