diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2007-10-29 00:31:16 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 10:41:32 -0400 |
| commit | ca5cd877ae699e758e6f26efc11b01bf6631d427 (patch) | |
| tree | f2337ce76ab006d9705b10e8e0ed2f62487c837f /drivers/md/raid6sse2.c | |
| parent | 2a397e82c7db18019e408f953dd58dc1963a328c (diff) | |
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>
Diffstat (limited to 'drivers/md/raid6sse2.c')
| -rw-r--r-- | drivers/md/raid6sse2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/raid6sse2.c b/drivers/md/raid6sse2.c index 0f019762a7c3..b034ad868039 100644 --- a/drivers/md/raid6sse2.c +++ b/drivers/md/raid6sse2.c | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | * | 17 | * |
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #if defined(__i386__) || defined(__x86_64__) | 20 | #if (defined(__i386__) || defined(__x86_64__)) && !defined(__arch_um__) |
| 21 | 21 | ||
| 22 | #include "raid6.h" | 22 | #include "raid6.h" |
| 23 | #include "raid6x86.h" | 23 | #include "raid6x86.h" |
| @@ -161,7 +161,7 @@ const struct raid6_calls raid6_sse2x2 = { | |||
| 161 | 161 | ||
| 162 | #endif | 162 | #endif |
| 163 | 163 | ||
| 164 | #ifdef __x86_64__ | 164 | #if defined(__x86_64__) && !defined(__arch_um__) |
| 165 | 165 | ||
| 166 | /* | 166 | /* |
| 167 | * Unrolled-by-4 SSE2 implementation | 167 | * Unrolled-by-4 SSE2 implementation |