Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[~andy/linux] / lib / raid6 / sse2.c

diff --git a/lib/raid6/sse2.c b/lib/raid6/sse2.c
index bc2d57daa589a714a29fc21e96927636b68b7679..85b82c85f28e61699bbf94e19e3f2f7750108d10 100644 (file)
--- a/lib/raid6/sse2.c
+++ b/lib/raid6/sse2.c
@@ -17,8 +17,6 @@
  *
  */
 
-#if (defined(__i386__) || defined(__x86_64__)) && !defined(__arch_um__)
-
 #include <linux/raid/pq.h>
 #include "x86.h"
 
@@ -159,9 +157,7 @@ const struct raid6_calls raid6_sse2x2 = {
        1                       /* Has cache hints */
 };
 
-#endif
-
-#if defined(__x86_64__) && !defined(__arch_um__)
+#ifdef CONFIG_X86_64
 
 /*
  * Unrolled-by-4 SSE2 implementation
@@ -259,4 +255,4 @@ const struct raid6_calls raid6_sse2x4 = {
        1                       /* Has cache hints */
 };
 
-#endif
+#endif /* CONFIG_X86_64 */