From: Sven Schnelle <svens@linux.ibm.com>
Date: Mon, 5 Dec 2022 14:20:46 +0000 (+0100)
Subject: s390/diag: use __packed __aligned
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=fe5e23dd983cc3e676f2f9355796e2505d889ce4;p=linux.git

s390/diag: use __packed __aligned

Use __packed __aligned instead of __attribute__((packed, aligned(X)));
to match the rest of the file.

Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Acked-by: Heiko Carstens <hca@linux.ibm.com>
Signed-off-by: Heiko Carstens <hca@linux.ibm.com>
---

diff --git a/arch/s390/include/asm/diag.h b/arch/s390/include/asm/diag.h
index 9488b7ffb21cf..674a939f16ee6 100644
--- a/arch/s390/include/asm/diag.h
+++ b/arch/s390/include/asm/diag.h
@@ -81,7 +81,7 @@ struct diag210 {
 	u8 vrdccrty;	/* real device type (output) */
 	u8 vrdccrmd;	/* real device model (output) */
 	u8 vrdccrft;	/* real device feature (output) */
-} __attribute__((packed, aligned(4)));
+} __packed __aligned(4);
 
 extern int diag210(struct diag210 *addr);