Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
IronPort-SDR: wI8hrtd72CYlFTTqZP6FpjOBcoT2kfc6XtnKEoSfJmYM6J4SdvjpStSd3QxukOUxRcKubNM45H
 FPtKpZ/fY3ycVPFGlXi7LYXUq4C0dt78JVFrJl+CgRhk6yEPQ7nvR4DjcOsAgXrEr3pP+w/fEM
 JBu11xKqJ38zxnGiNFuJFNEwpHfR5mtASM+IYmYtJsYKoLlDfHgTypKEvFGU7fZMR9KG1w0UxL
 wYjwlTwYEMUxpDzd2p9SKTFe4QRoCl56RI4omXduYWBx71quS6cvySMrkRAf+n0wyK4wKKr0ff
 yfI=
IronPort-SDR: 3Q4fSQ1tMzhHW5ow1Oa5sir8jb0nll0c5HphBwo/0eAXjkuK8UC7yG2rIjh+BJJrc/IoUSUl8E
 wFniW5mD9O9pjPu8Rji74hva7bcachap2LBgxR0FvvXi5WWQhaROdO6L7zU1Q6q300ZI0UXqyo
 +fJ7/RcRX1uyuv1la/2Q1SUiU8KUp7Hi/sZZiNfFQaIbvAXQNWbOYE24D0zrh71mxI7e24Wg4P
 1Pxz+N/4EWPQmm1JvqXeI8BI3Fn0yQWEzibEPH9e5sQsvYUh5dBOe0zfnfg7kh8d3qGmvh/MKn
 WIoXg9uMCuNWotrtXGBmUMP0
IronPort-SDR: Dz0M+IAo+4wEj1xOA9OuK1TY7/bzSPMnj56ySQqqLHxHvhJqyk+qM7mAVnJVSzpTgtWXeJGXeT
 VR7FIVmdIBGVqnmB3xCVDmmWT+OjqX3n1v3Hd9XToK4l5EmqTrcu7eRpU7PQkGXRpqGEg0eCBV
 NwsGHI9DjzM+VRiXDScIaGRIIPUIqG5/OYkSby1iHa9my/PtofrTcTDnMAHzWfBXA2HLzqtPWT
 ReqvW0u8MFrhAYRboKlwLjqEB0pcnS80OdRU0TCPHKmKJktCldw8RVSryG1VikQdZBmsEH7sLg
 vxg=
From:   Alistair Francis <alistair.francis@wdc.com>
To:     linux-riscv@lists.infradead.org, arnd@arndb.de
Cc:     linux-kernel@vger.kernel.org, alistair23@gmail.com,
        Alistair Francis <alistair.francis@wdc.com>
Subject: [PATCH RESEND 1/2] uapi/asm-generic: Allow defining a custom __SIGINFO struct
Date:   Tue,  2 Jul 2019 17:52:01 -0700
Message-Id: <20190703005202.7578-2-alistair.francis@wdc.com>
In-Reply-To: <20190703005202.7578-1-alistair.francis@wdc.com>
References: <20190703005202.7578-1-alistair.francis@wdc.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

Allow defining a custom __SIGINFO struct. This allows architectures to
apply their own padding and allignment requirements to the struct. This
is similar to the __ARCH_SI_ATTRIBUTES #define that already exists, but
applies to the __SIGINFO struct instead of the siginfo_t struct.

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
---
 include/uapi/asm-generic/siginfo.h | 32 ++++++++++++++++--------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/include/uapi/asm-generic/siginfo.h b/include/uapi/asm-generic/siginfo.h
index cb3d6c267181..09b0a1abac14 100644
--- a/include/uapi/asm-generic/siginfo.h
+++ b/include/uapi/asm-generic/siginfo.h
@@ -108,23 +108,25 @@ union __sifields {
 	} _sigsys;
 };
 
-#ifndef __ARCH_HAS_SWAPPED_SIGINFO
-#define __SIGINFO 			\
-struct {				\
-	int si_signo;			\
-	int si_errno;			\
-	int si_code;			\
-	union __sifields _sifields;	\
+#ifndef __SIGINFO
+# ifndef __ARCH_HAS_SWAPPED_SIGINFO
+# define __SIGINFO 						\
+struct {							\
+	int si_signo;						\
+	int si_errno;						\
+	int si_code;						\
+	union __sifields _sifields __ARCH_SI_ATTRIBUTES;	\
 }
-#else
-#define __SIGINFO 			\
-struct {				\
-	int si_signo;			\
-	int si_code;			\
-	int si_errno;			\
-	union __sifields _sifields;	\
+# else
+# define __SIGINFO 						\
+struct {							\
+	int si_signo;						\
+	int si_code;						\
+	int si_errno;						\
+	union __sifields _sifields __ARCH_SI_ATTRIBUTES;	\
 }
-#endif /* __ARCH_HAS_SWAPPED_SIGINFO */
+# endif /* __ARCH_HAS_SWAPPED_SIGINFO */
+#endif /* __SIGINFO */
 
 typedef struct siginfo {
 	union {
-- 
2.22.0