summaryrefslogtreecommitdiffstats
path: root/include/linux/eventpoll.h
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2007-03-26 21:32:20 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-03-27 09:05:15 -0700
commitd75e26a8298f84bca66374e98fa69049f26083ba (patch)
tree9893112e17b0085d7bf938a05fa262d04e2fd866 /include/linux/eventpoll.h
parent3899210ad9850e3b8909674c92dccbd3caaf9750 (diff)
downloadlinux-stable-d75e26a8298f84bca66374e98fa69049f26083ba.tar.gz
linux-stable-d75e26a8298f84bca66374e98fa69049f26083ba.tar.bz2
linux-stable-d75e26a8298f84bca66374e98fa69049f26083ba.zip
[PATCH] uml: fix epoll
UML/x86_64 needs the same packing of struct epoll_event as x86_64. Signed-off-by: Jeff Dike <jdike@linux.intel.com> Cc: Davide Libenzi <davidel@xmailserver.org> Cc: <stable@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/eventpoll.h')
-rw-r--r--include/linux/eventpoll.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h
index 84cfa8bbdc36..d2a96cbf4f0e 100644
--- a/include/linux/eventpoll.h
+++ b/include/linux/eventpoll.h
@@ -31,12 +31,19 @@
/*
* 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.
*/
#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;