diff options
| author | Ingo Molnar <mingo@elte.hu> | 2012-03-14 10:44:48 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2012-03-14 10:44:48 +0400 |
| commit | ea281a9ebaba3287130dbe15bb0aad6f798bb06b (patch) | |
| tree | cd365ac8eaa292df63ec183617c1f1c5128ebfca /arch/x86/include | |
| parent | cd593accdcc27ccbe6498d9ad1c2b6cc8e1d830d (diff) | |
| parent | fadd85f16a8ec3fee8af599e79a209682dc52348 (diff) | |
| download | linux-ea281a9ebaba3287130dbe15bb0aad6f798bb06b.tar.xz | |
Merge tag 'mce-for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras into x86/mce
Apply two miscellaneous MCE fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/mce.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h index 6aefb14cbbc5..441520e4174f 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h @@ -151,7 +151,7 @@ static inline void enable_p5_mce(void) {} void mce_setup(struct mce *m); void mce_log(struct mce *m); -extern struct device *mce_device[CONFIG_NR_CPUS]; +DECLARE_PER_CPU(struct device *, mce_device); /* * Maximum banks number. |