---

yaml --- r: 156934 b: refs/heads/master c: 4e5c25d h: refs/heads/master v: v3
git-mirror · Aug 16, 2009 · 4acf7a5 · 4acf7a5
1 parent e4fe14d
commit 4acf7a5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ef12c3c97603bad405d30c989718cc9405e2759
+refs/heads/master: 4e5c25d405e18a2f279ca2bfc855508ec3a0186b
diff --git a/trunk/arch/x86/kernel/cpu/mcheck/therm_throt.c b/trunk/arch/x86/kernel/cpu/mcheck/therm_throt.c
@@ -116,11 +116,14 @@ static int therm_throt_process(int curr)
 		       cpu, __get_cpu_var(thermal_throttle_count));
 
 		add_taint(TAINT_MACHINE_CHECK);
-	} else if (was_throttled) {
+		return 1;
+	}
+	if (was_throttled) {
 		printk(KERN_INFO "CPU%d: Temperature/speed normal\n", cpu);
+		return 1;
 	}
 
-	return 1;
+	return 0;
 }
 
 #ifdef CONFIG_SYSFS