aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/raid6x86.h
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-10-29 04:31:16 +0000
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-29 07:41:32 -0700
commitca5cd877ae699e758e6f26efc11b01bf6631d427 (patch)
treef2337ce76ab006d9705b10e8e0ed2f62487c837f /drivers/md/raid6x86.h
parent2a397e82c7db18019e408f953dd58dc1963a328c (diff)
downloadkernel_samsung_aries-ca5cd877ae699e758e6f26efc11b01bf6631d427.zip
kernel_samsung_aries-ca5cd877ae699e758e6f26efc11b01bf6631d427.tar.gz
kernel_samsung_aries-ca5cd877ae699e758e6f26efc11b01bf6631d427.tar.bz2
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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid6x86.h b/drivers/md/raid6x86.h
index 9111950..99fea7a 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 */