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:
@ -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 */
|
||||
|
||||
|
Reference in New Issue
Block a user