diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-25 20:26:33 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-25 20:26:33 +0200 |
commit | ec73adba51b4dae11134f7e6ffc84feade9f15fa (patch) | |
tree | 59b1d2c90f960d69fd247289fcd59fc213484a70 /include/asm-x86/mce.h | |
parent | Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
parent | x86: add X86_FEATURE_XMM4_2 definitions (diff) | |
download | linux-ec73adba51b4dae11134f7e6ffc84feade9f15fa.tar.xz linux-ec73adba51b4dae11134f7e6ffc84feade9f15fa.zip |
Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86: add X86_FEATURE_XMM4_2 definitions
x86: fix cpufreq + sched_clock() regression
x86: fix HPET regression in 2.6.26 versus 2.6.25, check hpet against BAR, v3
x86: do not enable TSC notifier if we don't need it
x86 MCE: Fix CPU hotplug problem with multiple multicore AMD CPUs
x86: fix: make PCI ECS for AMD CPUs hotplug capable
x86: fix: do not run code in amd_bus.c on non-AMD CPUs
Diffstat (limited to 'include/asm-x86/mce.h')
-rw-r--r-- | include/asm-x86/mce.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-x86/mce.h b/include/asm-x86/mce.h index 94f1fd79e22a..531eaa587455 100644 --- 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); |