diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2008-10-17 08:41:20 +0200 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-10-17 08:42:03 +0200 |
| commit | 22a94d79a34bf010d11996d30eed8ee3fc1a4fbf (patch) | |
| tree | 5213d9bc43c0613a4606e8d2928f2e17f7f74c2c /drivers/acpi | |
| parent | don't load asus-acpi if model is not supported (diff) | |
| download | linux-22a94d79a34bf010d11996d30eed8ee3fc1a4fbf.tar.xz linux-22a94d79a34bf010d11996d30eed8ee3fc1a4fbf.zip | |
ACPI: Allow overriding to higher critical trip point.
http://bugzilla.kernel.org/show_bug.cgi?id=9129
lenb: Note that overriding a critical trip point
may simply fool the user into thinking that they
have control that they do not actually have.
For it is EC firmware that decides when the EC
sends Linux temperature change events, and the
EC may or may not decide to send Linux these events
anywhere in the neighborhood of the fake
override trip points. Beware.
note also that thermal.nocrt is already available
to disable crtical trip point actios,
and thermal.crt=-1 is already available to
disabled critical trip points entirely.
Signed-off-by: Zhang Rui <rui.zhang@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/thermal.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/acpi/thermal.c b/drivers/acpi/thermal.c index e052a75c29ce..e9e17dfc5dc2 100644 --- a/drivers/acpi/thermal.c +++ b/drivers/acpi/thermal.c @@ -388,10 +388,12 @@ static int acpi_thermal_trips_update(struct acpi_thermal *tz, int flag) } else if (crt > 0) { unsigned long crt_k = CELSIUS_TO_KELVIN(crt); /* - * Allow override to lower critical threshold + * Allow override critical threshold */ - if (crt_k < tz->trips.critical.temperature) - tz->trips.critical.temperature = crt_k; + if (crt_k > tz->trips.critical.temperature) + printk(KERN_WARNING PREFIX + "Critical threshold %d C\n", crt); + tz->trips.critical.temperature = crt_k; } } } |