From 5f3eb432884ae1b3c61977d93a4bdf0263fcdce6 Mon Sep 17 00:00:00 2001 From: Michael Munday Date: Thu, 9 Jun 2016 12:01:43 -0400 Subject: [PATCH] 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 TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor --- src/syscall/types_linux.go | 2 +- src/syscall/ztypes_linux_s390x.go | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) 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 } -- 2.50.0