From: Michael Munday <munday@ca.ibm.com>
Date: Thu, 9 Jun 2016 16:01:43 +0000 (-0400)
Subject: syscall: add a padding field to EpollEvent on s390x
X-Git-Tag: go1.7beta2~26
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=5f3eb432884ae1b3c61977d93a4bdf0263fcdce6;p=gostls13.git

syscall: add a padding field to EpollEvent on s390x

Fixes #16021.

Change-Id: I55df38bbccd2641abcb54704115002a9aa04325d
Reviewed-on: https://go-review.googlesource.com/23962
Run-TryBot: Michael Munday <munday@ca.ibm.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---

diff --git a/src/syscall/types_linux.go b/src/syscall/types_linux.go
index 28d0225cbf..2a16650c0b 100644
--- a/src/syscall/types_linux.go
+++ b/src/syscall/types_linux.go
@@ -117,7 +117,7 @@ struct my_epoll_event {
 	// alignment requirements of EABI
 	int32_t padFd;
 #endif
-#ifdef  __powerpc64__
+#if defined(__powerpc64__) || defined(__s390x__)
 	int32_t _padFd;
 #endif
 	int32_t fd;
diff --git a/src/syscall/ztypes_linux_s390x.go b/src/syscall/ztypes_linux_s390x.go
index 3ab8e6a558..cdde47863f 100644
--- a/src/syscall/ztypes_linux_s390x.go
+++ b/src/syscall/ztypes_linux_s390x.go
@@ -588,6 +588,7 @@ type Ustat_t struct {
 
 type EpollEvent struct {
 	Events uint32
+	_      int32
 	Fd     int32
 	Pad    int32
 }