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: HaOIet/84U4Y9OYdqA+YSj3E5dejzBA2JHQNSNSejoRNovxc1/HcT8JC4v41YewWEI+FdOTQBt
 EQfbUfm2RwxxsdFxzPibFlKvQT511j/a9jCSqsIKrXlGizyqw9eNlD/+aAIEEW4ISijkFZdlJ7
 1V/C0Jw7pDmGWg5jznabivI+NscZWzTPi/emOfuyFebYlkZ75plt377SmdM4+o5/klVIc+K42/
 gnZA4i6akFVNVMhukP62fySHt4yoK8QSdK0Km5FDFMivCmhZuSvVCNrfs+lA1G8FJVUIxOHyAa
 8Ik=
IronPort-SDR: QGMJZo2F3uqD8bPYl1o0Inag62CUN451vtBcMHr0xNWTtBCF0U1+ae+SN5EoO1ofC/DsWJ3+3g
 Avbf7JF/Ly9H5oL6w9TCi12e80/z2SjzgBj10dErkc9/J8TILKuAB7bDhCjXXjYQazL8MT8ejQ
 lCqfVE4SMXVYKRYZyYhj4m+gmFZza86F2A3fz6M1DzWUOJR2RteOZ0Hg5jIBcyZEZw+O2Di0Sg
 jn+EIe2JkTzwnkEyQatWNjJoVDbiEVjMwPjcW5zxndUaNVTPlFd68ro3SXdiDQ1xdaW+7fSULj
 g82XYEeSvJEFfFi45MF+0q2k
IronPort-SDR: /Eb1azSXdLTLOQebGrz33CI2vNFmODdRTLA82uH87JswgpR2U10iElkUtedDOuRAqydizkFavC
 1V3LPk7wntybdS20LKCcNsUYV13a/oR3UCsCX+oP1gGGF2u4a0/7kDtEuWADI+q074AHzHRlGi
 eYfQOv+tgKvepB5dQwCzMzq75pJqZz4Yg5otonrNbiED4axAAq0uoh4aFZ27cg271THISFLjPu
 fvEc+G7PrI5Dm+dGnDcyfK55mVmBt6GBpTi8E78KBJ8HMniQwTW7jbnaUwDui0msqD5udCcpA1
 bfY=
From:   Alistair Francis <alistair.francis@wdc.com>
To:     linux-riscv-bounces@lists.infradead.org, arnd@arndb.de
Cc:     linux-kernel@vger.kernel.org, alistair23@gmail.com,
        Alistair Francis <alistair.francis@wdc.com>
Subject: [PATCH 1/2] uapi/asm-generic: Allow defining a custom __SIGINFO struct
Date:   Tue,  2 Jul 2019 17:18:41 -0700
Message-Id: <20190703001842.12238-2-alistair.francis@wdc.com>
In-Reply-To: <20190703001842.12238-1-alistair.francis@wdc.com>
References: <20190703001842.12238-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