diff options
Diffstat (limited to 'drivers/macintosh')
-rw-r--r-- | drivers/macintosh/therm_pm72.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c index 3fc8cdd94c3d..190878eef990 100644 --- a/drivers/macintosh/therm_pm72.c +++ b/drivers/macintosh/therm_pm72.c | |||
@@ -923,7 +923,7 @@ static void do_monitor_cpu_combined(void) | |||
923 | if (temp_combi >= ((state0->mpu.tmax + 8) << 16)) { | 923 | if (temp_combi >= ((state0->mpu.tmax + 8) << 16)) { |
924 | printk(KERN_WARNING "Warning ! Temperature way above maximum (%d) !\n", | 924 | printk(KERN_WARNING "Warning ! Temperature way above maximum (%d) !\n", |
925 | temp_combi >> 16); | 925 | temp_combi >> 16); |
926 | state0->overtemp = CPU_MAX_OVERTEMP; | 926 | state0->overtemp += CPU_MAX_OVERTEMP / 4; |
927 | } else if (temp_combi > (state0->mpu.tmax << 16)) | 927 | } else if (temp_combi > (state0->mpu.tmax << 16)) |
928 | state0->overtemp++; | 928 | state0->overtemp++; |
929 | else | 929 | else |
@@ -933,7 +933,7 @@ static void do_monitor_cpu_combined(void) | |||
933 | if (state0->overtemp > 0) { | 933 | if (state0->overtemp > 0) { |
934 | state0->rpm = state0->mpu.rmaxn_exhaust_fan; | 934 | state0->rpm = state0->mpu.rmaxn_exhaust_fan; |
935 | state0->intake_rpm = intake = state0->mpu.rmaxn_intake_fan; | 935 | state0->intake_rpm = intake = state0->mpu.rmaxn_intake_fan; |
936 | pump = state0->pump_min; | 936 | pump = state0->pump_max; |
937 | goto do_set_fans; | 937 | goto do_set_fans; |
938 | } | 938 | } |
939 | 939 | ||
@@ -998,7 +998,7 @@ static void do_monitor_cpu_split(struct cpu_pid_state *state) | |||
998 | printk(KERN_WARNING "Warning ! CPU %d temperature way above maximum" | 998 | printk(KERN_WARNING "Warning ! CPU %d temperature way above maximum" |
999 | " (%d) !\n", | 999 | " (%d) !\n", |
1000 | state->index, temp >> 16); | 1000 | state->index, temp >> 16); |
1001 | state->overtemp = CPU_MAX_OVERTEMP; | 1001 | state->overtemp += CPU_MAX_OVERTEMP / 4; |
1002 | } else if (temp > (state->mpu.tmax << 16)) | 1002 | } else if (temp > (state->mpu.tmax << 16)) |
1003 | state->overtemp++; | 1003 | state->overtemp++; |
1004 | else | 1004 | else |
@@ -1060,7 +1060,7 @@ static void do_monitor_cpu_rack(struct cpu_pid_state *state) | |||
1060 | printk(KERN_WARNING "Warning ! CPU %d temperature way above maximum" | 1060 | printk(KERN_WARNING "Warning ! CPU %d temperature way above maximum" |
1061 | " (%d) !\n", | 1061 | " (%d) !\n", |
1062 | state->index, temp >> 16); | 1062 | state->index, temp >> 16); |
1063 | state->overtemp = CPU_MAX_OVERTEMP; | 1063 | state->overtemp = CPU_MAX_OVERTEMP / 4; |
1064 | } else if (temp > (state->mpu.tmax << 16)) | 1064 | } else if (temp > (state->mpu.tmax << 16)) |
1065 | state->overtemp++; | 1065 | state->overtemp++; |
1066 | else | 1066 | else |