Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[linux-2.6-omap-h63xx.git] / arch / powerpc / kernel / fpu.S

diff --git a/arch/powerpc/kernel/fpu.S b/arch/powerpc/kernel/fpu.S
index 340730fb8c9110608c8a47b5eb35724170e10d69..7e2c9fe44ac17046d1fca345526449c620f0d5f8 100644 (file)
--- a/arch/powerpc/kernel/fpu.S
+++ b/arch/powerpc/kernel/fpu.S
@@ -9,7 +9,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <asm/reg.h>
 #include <asm/page.h>
 #include <asm/mmu.h>
@@ -72,7 +71,7 @@ _GLOBAL(load_up_fpu)
        std     r12,_MSR(r1)
 #endif
        lfd     fr0,THREAD_FPSCR(r5)
-       mtfsf   0xff,fr0
+       MTFSF_L(fr0)
        REST_32FPRS(0, r5)
 #ifndef CONFIG_SMP
        subi    r4,r5,THREAD
@@ -127,7 +126,7 @@ _GLOBAL(giveup_fpu)
 
 _GLOBAL(cvt_fd)
        lfd     0,THREAD_FPSCR(r5)      /* load up fpscr value */
-       mtfsf   0xff,0
+       MTFSF_L(0)
        lfs     0,0(r3)
        stfd    0,0(r4)
        mffs    0
@@ -136,7 +135,7 @@ _GLOBAL(cvt_fd)
 
 _GLOBAL(cvt_df)
        lfd     0,THREAD_FPSCR(r5)      /* load up fpscr value */
-       mtfsf   0xff,0
+       MTFSF_L(0)
        lfd     0,0(r3)
        stfs    0,0(r4)
        mffs    0