Merge branch 'x86/cpu' into x86/core

[linux-2.6-omap-h63xx.git] / include / asm-x86 / mce.h

diff --git a/include/asm-x86/mce.h b/include/asm-x86/mce.h
index 6a580f24d4a4bb9049c7b2834bfeb6a3ce52246f..036133eaf7448e4625a713bab4b9ff3f53e98bb2 100644 (file)
--- a/include/asm-x86/mce.h
+++ b/include/asm-x86/mce.h
@@ -92,6 +92,7 @@ extern int mce_disabled;
 
 void mce_log(struct mce *m);
 DECLARE_PER_CPU(struct sys_device, device_mce);
+extern void (*threshold_cpu_callback)(unsigned long action, unsigned int cpu);
 
 #ifdef CONFIG_X86_MCE_INTEL
 void mce_intel_feature_init(struct cpuinfo_x86 *c);