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 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzi...
[pandora-kernel.git]
/
arch
/
x86
/
include
/
asm
/
mce.h
diff --git
a/arch/x86/include/asm/mce.h
b/arch/x86/include/asm/mce.h
index
c62c13c
..
eb16e94
100644
(file)
--- a/
arch/x86/include/asm/mce.h
+++ b/
arch/x86/include/asm/mce.h
@@
-223,6
+223,9
@@
void intel_init_thermal(struct cpuinfo_x86 *c);
void mce_log_therm_throt_event(__u64 status);
+/* Interrupt Handler for core thermal thresholds */
+extern int (*platform_thermal_notify)(__u64 msr_val);
+
#ifdef CONFIG_X86_THERMAL_VECTOR
extern void mcheck_intel_therm_init(void);
#else