diff options
| author | Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com> | 2015-03-23 11:42:53 -0400 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2015-03-24 07:14:15 -0400 |
| commit | 43eaa2a1ad70d72876cdbb2eb5450a2665e4770f (patch) | |
| tree | 3da03b9d29bc15d06f19348f34a72d29f5a2ab49 /arch/x86/include/asm | |
| parent | bf80bbd7dcf525e41e0673fbaa8cd21d2344b460 (diff) | |
x86/mce: Define mce_severity function pointer
Rename mce_severity() to mce_severity_intel() and assign the
mce_severity function pointer to mce_severity_amd() during init on AMD.
This way, we can avoid a test to call mce_severity_amd every time we get
into mce_severity(). And it's cleaner to do it this way.
Signed-off-by: Aravind Gopalakrishnan <Aravind.Gopalakrishnan@amd.com>
Suggested-by: Tony Luck <tony.luck@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Chen Yucong <slaoub@gmail.com>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: linux-edac <linux-edac@vger.kernel.org>
Link: http://lkml.kernel.org/r/1427125373-2918-3-git-send-email-Aravind.Gopalakrishnan@amd.com
Signed-off-by: Borislav Petkov <bp@suse.de>
Diffstat (limited to 'arch/x86/include/asm')
| -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 b574fbf62d39..1f5a86d518db 100644 --- a/arch/x86/include/asm/mce.h +++ b/arch/x86/include/asm/mce.h | |||
| @@ -134,9 +134,11 @@ extern int mce_p5_enabled; | |||
| 134 | #ifdef CONFIG_X86_MCE | 134 | #ifdef CONFIG_X86_MCE |
| 135 | int mcheck_init(void); | 135 | int mcheck_init(void); |
| 136 | void mcheck_cpu_init(struct cpuinfo_x86 *c); | 136 | void mcheck_cpu_init(struct cpuinfo_x86 *c); |
| 137 | void mcheck_vendor_init_severity(void); | ||
| 137 | #else | 138 | #else |
| 138 | static inline int mcheck_init(void) { return 0; } | 139 | static inline int mcheck_init(void) { return 0; } |
| 139 | static inline void mcheck_cpu_init(struct cpuinfo_x86 *c) {} | 140 | static inline void mcheck_cpu_init(struct cpuinfo_x86 *c) {} |
| 141 | static inline void mcheck_vendor_init_severity(void) {} | ||
| 140 | #endif | 142 | #endif |
| 141 | 143 | ||
| 142 | #ifdef CONFIG_X86_ANCIENT_MCE | 144 | #ifdef CONFIG_X86_ANCIENT_MCE |
