Commit d75e26a8 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds

[PATCH] uml: fix epoll

UML/x86_64 needs the same packing of struct epoll_event as x86_64.
Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Cc: Davide Libenzi <davidel@xmailserver.org>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 3899210a
...@@ -31,12 +31,19 @@ ...@@ -31,12 +31,19 @@
/* /*
* On x86-64 make the 64bit structure have the same alignment as the * On x86-64 make the 64bit structure have the same alignment as the
* 32bit structure. This makes 32bit emulation easier. * 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.
*/ */
#ifdef __x86_64__ #ifdef __x86_64__
#define EPOLL_PACKED __attribute__((packed)) #define EPOLL_PACKED __attribute__((packed))
#else #else
#if defined(CONFIG_UML) && defined(CONFIG_UML_X86) && defined(CONFIG_64BIT)
#define EPOLL_PACKED __attribute__((packed))
#else
#define EPOLL_PACKED #define EPOLL_PACKED
#endif #endif
#endif
struct epoll_event { struct epoll_event {
__u32 events; __u32 events;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment