X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Feventpoll.h;h=d2a96cbf4f0eeac7b9d01ae11a7553a3be4f0d92;hb=refs%2Fheads%2Fvserver;hp=84cfa8bbdc3698fc3a1fdb998d8c606e4d6e9ced;hpb=16c70f8c1b54b61c3b951b6fb220df250fe09b32;p=linux-2.6.git

diff --git a/include/linux/eventpoll.h b/include/linux/eventpoll.h
index 84cfa8bbd..d2a96cbf4 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;