1 files changed, 3 insertions, 3 deletions

diff --git a/arch/i386/kernel/cpu/mcheck/k7.c b/arch/i386/kernel/cpu/mcheck/k7.c
index f9fa4142551e..eef63e3630c2 100644
--- a/arch/i386/kernel/cpu/mcheck/k7.c
+++ b/arch/i386/kernel/cpu/mcheck/k7.c
@@ -72,12 +72,12 @@ void amd_mcheck_init(struct cpuinfo_x86 *c)
         u32 l, h;
         int i;
 
-        machine_check_vector = k7_machine_check;
-        wmb();
-
         if (!cpu_has(c, X86_FEATURE_MCE))
                 return;
 
+        machine_check_vector = k7_machine_check;
+        wmb();
+
         printk (KERN_INFO "Intel machine check architecture supported.\n");
         rdmsr (MSR_IA32_MCG_CAP, l, h);
         if (l & (1<<8)) /* Control register present ? */