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 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[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
169d880
..
4b68326
100644
(file)
--- a/
arch/x86/kernel/cpu/mcheck/therm_throt.c
+++ b/
arch/x86/kernel/cpu/mcheck/therm_throt.c
@@
-350,7
+350,7
@@
static void intel_thermal_interrupt(void)
static void unexpected_thermal_interrupt(void)
{
- printk(KERN_ERR "CPU%d: Unexpected LVT
TMR
interrupt!\n",
+ printk(KERN_ERR "CPU%d: Unexpected LVT
thermal
interrupt!\n",
smp_processor_id());
add_taint(TAINT_MACHINE_CHECK);
}