diff options
author | Al Viro | 2007-10-29 05:31:16 +0100 |
---|---|---|
committer | Linus Torvalds | 2007-10-29 15:41:32 +0100 |
commit | ca5cd877ae699e758e6f26efc11b01bf6631d427 (patch) | |
tree | f2337ce76ab006d9705b10e8e0ed2f62487c837f /include/linux/eventpoll.h | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
download | kernel-qcow2-linux-ca5cd877ae699e758e6f26efc11b01bf6631d427.tar.gz kernel-qcow2-linux-ca5cd877ae699e758e6f26efc11b01bf6631d427.tar.xz kernel-qcow2-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 'include/linux/eventpoll.h')
-rw-r--r-- | include/linux/eventpoll.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h index d2a96cbf4f0e..cf79853967ff 100644 --- a/include/linux/eventpoll.h +++ b/include/linux/eventpoll.h @@ -32,18 +32,13 @@ * On x86-64 make the 64bit structure have the same alignment as the * 32bit structure. This makes 32bit emulation easier. * - * UML/x86_64 needs the same packing as x86_64 - UML + UML_X86 + - * 64_BIT adds up to UML/x86_64. + * UML/x86_64 needs the same packing as x86_64 */ #ifdef __x86_64__ #define EPOLL_PACKED __attribute__((packed)) #else -#if defined(CONFIG_UML) && defined(CONFIG_UML_X86) && defined(CONFIG_64BIT) -#define EPOLL_PACKED __attribute__((packed)) -#else #define EPOLL_PACKED #endif -#endif struct epoll_event { __u32 events; |