git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
x86
/
kernel
/
cpu
/
mcheck
/
therm_throt.c
diff --git
a/arch/x86/kernel/cpu/mcheck/therm_throt.c
b/arch/x86/kernel/cpu/mcheck/therm_throt.c
index
81c499e
..
e1a0a3b
100644
(file)
--- a/
arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/
arch/x86/kernel/cpu/mcheck/therm_throt.c
@@
-190,7
+190,7
@@
thermal_throttle_cpu_callback(struct notifier_block *nfb,
mutex_unlock(&therm_cpu_lock);
break;
}
- return
err ? NOTIFY_BAD : NOTIFY_OK
;
+ return
notifier_from_errno(err)
;
}
static struct notifier_block thermal_throttle_cpu_notifier __cpuinitdata =