---

yaml --- r: 117375 b: refs/heads/master c: 22a94d7 h: refs/heads/master i: 117373: ce6f8dc 117371: c96b94c 117367: f9ad7fd 117359: 9d6bd1b 117343: 43243c5 117311: 8404386 117247: 296cd3e v: v3
git-mirror · Oct 17, 2008 · 304e242 · 304e242
1 parent e52d97f
commit 304e242
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7745384080ef70f7710530afa3e45477b126e056
+refs/heads/master: 22a94d79a34bf010d11996d30eed8ee3fc1a4fbf
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
@@ -2146,7 +2146,7 @@ and is between 256 and 4096 characters. It is defined in the file
 
 	thermal.crt=	[HW,ACPI]
 			-1: disable all critical trip points in all thermal zones
-			<degrees C>: lower all critical trip points
+			<degrees C>: override all critical trip points
 
 	thermal.nocrt=	[HW,ACPI]
 			Set to disable actions on ACPI thermal zone

diff --git a/trunk/drivers/acpi/thermal.c b/trunk/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;
 			}
 		}
 	}