[ This is both 2.6.21 and -stable material ]
UML/x86_64 needs the same packing of struct epoll_event as x86_64.
Signed-off-by: Jeff Dike <jdike.TakeThisOut@linux.intel.com>
--
include/linux/eventpoll.h | 7 +++++++
1 file changed, 7 insertions(+)
Index: linux-2.6.21-mm/include/linux/eventpoll.h
===================================================================
--- linux-2.6.21-mm.orig/include/linux/eventpoll.h 2007-03-05 13:01:17.000000000 -0500
+++ linux-2.6.21-mm/include/linux/eventpoll.h 2007-03-23 14:03:07.000000000 -0400
@@ -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;
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo.TakeThisOut@vger.kernel.org
More majordomo info at
http://vger.kernel.org/majordomo-info.html
Please read the FAQ at
http://www.tux.org/lkml/
Linux