From: Paul Burton <paul@archlinuxmips.org>
Date: Sun, 22 Jun 2014 10:25:39 +0000 (+0100)
Subject: linux-user: fix struct target_epoll_event layout for MIPS
X-Git-Tag: qemu-xen-4.6.0-rc1~343^2~4
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fd7678324391d497b53afa40eeafe04cc05030df;p=qemu-upstream-4.6-testing.git

linux-user: fix struct target_epoll_event layout for MIPS

MIPS requires the pad field to 64b-align the data field just as ARM
does.

Signed-off-by: Paul Burton <paul@archlinuxmips.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---

diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 69c3982ee..e379b45ca 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -2528,7 +2528,7 @@ typedef union target_epoll_data {
 
 struct target_epoll_event {
     uint32_t events;
-#ifdef TARGET_ARM
+#if defined(TARGET_ARM) || defined(TARGET_MIPS) || defined(TARGET_MIPS64)
     uint32_t __pad;
 #endif
     target_epoll_data_t data;