diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2007-10-29 05:31:16 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 15:41:32 +0100 |
| commit | ca5cd877ae699e758e6f26efc11b01bf6631d427 (patch) | |
| tree | f2337ce76ab006d9705b10e8e0ed2f62487c837f /drivers/md/raid6x86.h | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | linux-ca5cd877ae699e758e6f26efc11b01bf6631d427.tar.xz linux-ca5cd877ae699e758e6f26efc11b01bf6631d427.zip | |
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/raid6x86.h')
| -rw-r--r-- | drivers/md/raid6x86.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid6x86.h b/drivers/md/raid6x86.h index 9111950414ff..99fea7a70ca7 100644 --- a/drivers/md/raid6x86.h +++ b/drivers/md/raid6x86.h @@ -19,7 +19,7 @@ #ifndef LINUX_RAID_RAID6X86_H #define LINUX_RAID_RAID6X86_H -#if defined(__i386__) || defined(__x86_64__) +#if (defined(__i386__) || defined(__x86_64__)) && !defined(__arch_um__) #ifdef __KERNEL__ /* Real code */ |