diff options
| author | Michael Munday <munday@ca.ibm.com> | 2016-06-09 12:01:43 -0400 |
|---|---|---|
| committer | Michael Munday <munday@ca.ibm.com> | 2016-06-10 03:54:43 +0000 |
| commit | 5f3eb432884ae1b3c61977d93a4bdf0263fcdce6 (patch) | |
| tree | 2a970f3ebc89505ec550762cfa5e850d6f8a996d /src/syscall/types_linux.go | |
| parent | 8042bfe347d5b2c4f6af372b09b23c8945fb196e (diff) | |
| download | go-5f3eb432884ae1b3c61977d93a4bdf0263fcdce6.tar.xz | |
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>
Diffstat (limited to 'src/syscall/types_linux.go')
| -rw-r--r-- | src/syscall/types_linux.go | 2 |
1 files changed, 1 insertions, 1 deletions
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; |