diff options
| author | Andi Kleen <ak@suse.de> | 2006-04-07 19:49:57 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-09 11:53:52 -0700 |
| commit | 553f265fe883a23502ee351845f09334790f18b8 (patch) | |
| tree | 1fd60e72d7d5cbed34812eb6763899d2bd37c152 /include | |
| parent | be56db6186999a8571ae480cf2b929578f6dfd68 (diff) | |
| download | talos-op-linux-553f265fe883a23502ee351845f09334790f18b8.tar.gz talos-op-linux-553f265fe883a23502ee351845f09334790f18b8.zip | |
[PATCH] x86_64: Don't run NMI watchdog during machine checks
Machine checks can stall the machine for a long time and
it's not good to trigger the nmi watchdog during that.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-x86_64/mce.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-x86_64/mce.h b/include/asm-x86_64/mce.h index 5d298b799a9f..7229785094e3 100644 --- a/include/asm-x86_64/mce.h +++ b/include/asm-x86_64/mce.h @@ -70,6 +70,9 @@ struct mce_log { #define MCE_THRESHOLD_BASE MCE_EXTENDED_BANK + 1 /* MCE_AMD */ #define MCE_THRESHOLD_DRAM_ECC MCE_THRESHOLD_BASE + 4 +#ifdef __KERNEL__ +#include <asm/atomic.h> + void mce_log(struct mce *m); #ifdef CONFIG_X86_MCE_INTEL void mce_intel_feature_init(struct cpuinfo_x86 *c); @@ -87,4 +90,8 @@ static inline void mce_amd_feature_init(struct cpuinfo_x86 *c) } #endif +extern atomic_t mce_entry; + +#endif + #endif |
