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>
This commit is contained in:
parent
2a397e82c7
commit
ca5cd877ae
11 changed files with 13 additions and 23 deletions
|
@ -52,7 +52,7 @@ const struct raid6_calls * const raid6_algos[] = {
|
|||
&raid6_intx16,
|
||||
&raid6_intx32,
|
||||
#endif
|
||||
#if defined(__i386__)
|
||||
#if defined(__i386__) && !defined(__arch_um__)
|
||||
&raid6_mmxx1,
|
||||
&raid6_mmxx2,
|
||||
&raid6_sse1x1,
|
||||
|
@ -60,7 +60,7 @@ const struct raid6_calls * const raid6_algos[] = {
|
|||
&raid6_sse2x1,
|
||||
&raid6_sse2x2,
|
||||
#endif
|
||||
#if defined(__x86_64__)
|
||||
#if defined(__x86_64__) && !defined(__arch_um__)
|
||||
&raid6_sse2x1,
|
||||
&raid6_sse2x2,
|
||||
&raid6_sse2x4,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue