diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-08 12:06:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-10-08 12:06:36 -0700 |
| commit | 624235c5b3a62639136b7823c2c88e4aeb5c5a8d (patch) | |
| tree | 563cedd7577458a3c849549b84729beeca84da0c /arch/x86/include | |
| parent | f17f36bb1c006818441b84cf65a6decf3e59942b (diff) | |
| parent | e3be785fb59f92c0df685037062d041619653b7a (diff) | |
| download | blackbird-op-linux-624235c5b3a62639136b7823c2c88e4aeb5c5a8d.tar.gz blackbird-op-linux-624235c5b3a62639136b7823c2c88e4aeb5c5a8d.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, pci: Correct spelling in a comment
x86: Simplify bound checks in the MTRR code
x86: EDAC: carve out AMD MCE decoding logic
initcalls: Add early_initcall() for modules
x86: EDAC: MCE: Fix MCE decoding callback logic
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/mce.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index b608a64c5814..f1363b72364f 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -133,6 +133,8 @@ static inline void winchip_mcheck_init(struct cpuinfo_x86 *c) {} static inline void enable_p5_mce(void) {} #endif +extern void (*x86_mce_decode_callback)(struct mce *m); + void mce_setup(struct mce *m); void mce_log(struct mce *m); DECLARE_PER_CPU(struct sys_device, mce_dev); |
