Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq

[pandora-kernel.git] / arch / powerpc / kernel / traps.c

diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index 1a01414..f19d977 100644 (file)
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -1387,10 +1387,7 @@ void SPEFloatingPointException(struct pt_regs *regs)
        int code = 0;
        int err;
 
-       preempt_disable();
-       if (regs->msr & MSR_SPE)
-               giveup_spe(current);
-       preempt_enable();
+       flush_spe_to_thread(current);
 
        spefscr = current->thread.spefscr;
        fpexc_mode = current->thread.fpexc_mode;