projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
[powerpc.git]
/
arch
/
i386
/
kernel
/
cpu
/
mcheck
/
therm_throt.c
diff --git
a/arch/i386/kernel/cpu/mcheck/therm_throt.c
b/arch/i386/kernel/cpu/mcheck/therm_throt.c
index
2f28540
..
7ba7c3a
100644
(file)
--- a/
arch/i386/kernel/cpu/mcheck/therm_throt.c
+++ b/
arch/i386/kernel/cpu/mcheck/therm_throt.c
@@
-137,10
+137,12
@@
static __cpuinit int thermal_throttle_cpu_callback(struct notifier_block *nfb,
mutex_lock(&therm_cpu_lock);
switch (action) {
case CPU_ONLINE:
+ case CPU_ONLINE_FROZEN:
err = thermal_throttle_add_dev(sys_dev);
WARN_ON(err);
break;
case CPU_DEAD:
+ case CPU_DEAD_FROZEN:
thermal_throttle_remove_dev(sys_dev);
break;
}