Pull linus into release branch

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index 5bb36274a5c6..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)
         if (temp_combi >= ((state0->mpu.tmax + 8) << 16)) {
                 printk(KERN_WARNING "Warning ! Temperature way above maximum (%d) !\n",
                        temp_combi >> 16);
-                state0->overtemp = CPU_MAX_OVERTEMP;
+                state0->overtemp += CPU_MAX_OVERTEMP / 4;
         } else if (temp_combi > (state0->mpu.tmax << 16))
                 state0->overtemp++;
         else
@@ -998,7 +998,7 @@ static void do_monitor_cpu_split(struct cpu_pid_state *state)
                 printk(KERN_WARNING "Warning ! CPU %d temperature way above maximum"
                        " (%d) !\n",
                        state->index, temp >> 16);
-                state->overtemp = CPU_MAX_OVERTEMP;
+                state->overtemp += CPU_MAX_OVERTEMP / 4;
         } else if (temp > (state->mpu.tmax << 16))
                 state->overtemp++;
         else
@@ -1060,7 +1060,7 @@ static void do_monitor_cpu_rack(struct cpu_pid_state *state)
                 printk(KERN_WARNING "Warning ! CPU %d temperature way above maximum"
                        " (%d) !\n",
                        state->index, temp >> 16);
-                state->overtemp = CPU_MAX_OVERTEMP;
+                state->overtemp = CPU_MAX_OVERTEMP / 4;
         } else if (temp > (state->mpu.tmax << 16))
                 state->overtemp++;
         else