Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[pandora-kernel.git] / arch / x86 / kernel / cpu / bugs.c

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index 525514c..46674fb 100644 (file)
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -62,6 +62,8 @@ static void __init check_fpu(void)
                return;
        }
 
+       kernel_fpu_begin();
+
        /*
         * trap_init() enabled FXSR and company _before_ testing for FP
         * problems here.
@@ -80,6 +82,8 @@ static void __init check_fpu(void)
                : "=m" (*&fdiv_bug)
                : "m" (*&x), "m" (*&y));
 
+       kernel_fpu_end();
+
        boot_cpu_data.fdiv_bug = fdiv_bug;
        if (boot_cpu_data.fdiv_bug)
                printk(KERN_WARNING "Hmm, FPU with FDIV bug.\n");