commit ca5cd877ae699e758e6f26efc11b01bf6631d427
author Al Viro <viro@ftp.linux.org.uk> Mon Oct 29 04:31:16 2007 +0000
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Mon Oct 29 07:41:32 2007 -0700
tree f2337ce76ab006d9705b10e8e0ed2f62487c837f
parent 2a397e82c7db18019e408f953dd58dc1963a328c

x86 merge fallout: uml

Don't undef __i386__/__x86_64__ in uml anymore, make sure that (few) places
that required adjusting the ifdefs got those.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

drivers/md/raid6sse2.c

diff --git a/drivers/md/raid6sse2.c b/drivers/md/raid6sse2.c
index 0f01976..b034ad8 100644
--- a/drivers/md/raid6sse2.c
+++ b/drivers/md/raid6sse2.c
@@ -17,7 +17,7 @@
  *
  */
 
-#if defined(__i386__) || defined(__x86_64__)
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(__arch_um__)
 
 #include "raid6.h"
 #include "raid6x86.h"
@@ -161,7 +161,7 @@
 
 #endif
 
-#ifdef __x86_64__
+#if defined(__x86_64__) && !defined(__arch_um__)
 
 /*
  * Unrolled-by-4 SSE2 implementation