[PATCH] md: RAID6: clean up CPUID and FPU enter/exit code

- Use kernel_fpu_begin() and kernel_fpu_end()
- Use boot_cpu_has() for feature testing even in userspace

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 4 insertions, 12 deletions

diff --git a/drivers/md/raid6mmx.c b/drivers/md/raid6mmx.c
index 359157aaf9e0..6181a5a3365a 100644
--- a/drivers/md/raid6mmx.c
+++ b/drivers/md/raid6mmx.c
@@ -30,14 +30,8 @@ const struct raid6_mmx_constants {
 
 static int raid6_have_mmx(void)
 {
-#ifdef __KERNEL__
         /* Not really "boot_cpu" but "all_cpus" */
         return boot_cpu_has(X86_FEATURE_MMX);
-#else
-        /* User space test code */
-        u32 features = cpuid_features();
-        return ( (features & (1<<23)) == (1<<23) );
-#endif
 }
 
 /*
@@ -48,13 +42,12 @@ static void raid6_mmx1_gen_syndrome(int disks, size_t bytes, void **ptrs)
         u8 **dptr = (u8 **)ptrs;
         u8 *p, *q;
         int d, z, z0;
-        raid6_mmx_save_t sa;
 
         z0 = disks - 3;         /* Highest data disk */
         p = dptr[z0+1];         /* XOR parity */
         q = dptr[z0+2];         /* RS syndrome */
 
-        raid6_before_mmx(&sa);
+        kernel_fpu_begin();
 
         asm volatile("movq %0,%%mm0" : : "m" (raid6_mmx_constants.x1d));
         asm volatile("pxor %mm5,%mm5"); /* Zero temp */
@@ -78,7 +71,7 @@ static void raid6_mmx1_gen_syndrome(int disks, size_t bytes, void **ptrs)
                 asm volatile("pxor %mm4,%mm4");
         }
 
-        raid6_after_mmx(&sa);
+        kernel_fpu_end();
 }
 
 const struct raid6_calls raid6_mmxx1 = {
@@ -96,13 +89,12 @@ static void raid6_mmx2_gen_syndrome(int disks, size_t bytes, void **ptrs)
         u8 **dptr = (u8 **)ptrs;
         u8 *p, *q;
         int d, z, z0;
-        raid6_mmx_save_t sa;
 
         z0 = disks - 3;         /* Highest data disk */
         p = dptr[z0+1];         /* XOR parity */
         q = dptr[z0+2];         /* RS syndrome */
 
-        raid6_before_mmx(&sa);
+        kernel_fpu_begin();
 
         asm volatile("movq %0,%%mm0" : : "m" (raid6_mmx_constants.x1d));
         asm volatile("pxor %mm5,%mm5"); /* Zero temp */
@@ -137,7 +129,7 @@ static void raid6_mmx2_gen_syndrome(int disks, size_t bytes, void **ptrs)
                 asm volatile("movq %%mm6,%0" : "=m" (q[d+8]));
         }
 
-        raid6_after_mmx(&sa);
+        kernel_fpu_end();
 }
 
 const struct raid6_calls raid6_mmxx2 = {