summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGE-LOG1
-rw-r--r--pts-core/functions/pts-functions_system_cpu.php4
2 files changed, 4 insertions, 1 deletions
diff --git a/CHANGE-LOG b/CHANGE-LOG
index e7815c7..449ea4f 100644
--- a/CHANGE-LOG
+++ b/CHANGE-LOG
@@ -17,6 +17,7 @@ Phoronix Test Suite (Git)
- pts-core: Store aliases for distributions used in package identification in pts-core/static/software-vendor-aliases.txt
- pts-core: Rework option counting in pts_auto_process_test_option()
- pts-core: Add support for specifying multiple possible points in read_acpi() to provide some fallback support
+- pts-core: Allow reading from TZ00 thermal zone over ACPI for CPU temperature
- pts: Add more tests to netbook suite
Phoronix Test Suite 1.6.0 Alpha 3
diff --git a/pts-core/functions/pts-functions_system_cpu.php b/pts-core/functions/pts-functions_system_cpu.php
index 03d3641..7c72550 100644
--- a/pts-core/functions/pts-functions_system_cpu.php
+++ b/pts-core/functions/pts-functions_system_cpu.php
@@ -201,7 +201,9 @@ function hw_cpu_temperature()
if(empty($temp_c))
{
- $temp_c = read_acpi("/thermal_zone/THM0/temperature", "temperature"); // if it is THM0 that is for the CPU, in most cases it should be
+ $temp_c = read_acpi(array(
+ "/thermal_zone/THM0/temperature",
+ "/thermal_zone/TZ00/temperature"), "temperature");
if(($end = strpos($temp_c, ' ')) > 0)
{