summaryrefslogtreecommitdiffstats
path: root/pts-core
diff options
context:
space:
mode:
authorMichael Larabel <michael@phx-laptop.(none)>2008-12-16 19:11:12 -0500
committerMichael Larabel <michael@phx-laptop.(none)>2008-12-16 19:11:12 -0500
commita6dcb59a659b0f1b88b434419e2290eb63518a9a (patch)
tree6b9872139711d32bc3882d372b1be392f0c05296 /pts-core
parent8c14b9962144ebbebc9f0b855b86f8f8413b05de (diff)
downloadphoronix-test-suite-upstream-a6dcb59a659b0f1b88b434419e2290eb63518a9a.tar.gz
phoronix-test-suite-upstream-a6dcb59a659b0f1b88b434419e2290eb63518a9a.tar.xz
phoronix-test-suite-upstream-a6dcb59a659b0f1b88b434419e2290eb63518a9a.zip
pts-core: Allow reading from TZ00 thermal zone over ACPI for CPU
temperature
Diffstat (limited to 'pts-core')
-rw-r--r--pts-core/functions/pts-functions_system_cpu.php4
1 files changed, 3 insertions, 1 deletions
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)
{