projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[profile/ivi/kernel-x86-ivi.git]
/
drivers
/
md
/
raid6x86.h
diff --git
a/drivers/md/raid6x86.h
b/drivers/md/raid6x86.h
index
9111950
..
99fea7a
100644
(file)
--- 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 */