From: Sven Schnelle <svens@linux.ibm.com>
Date: Mon, 3 Aug 2020 08:50:38 +0200
Subject: s390/stp: use __packed
Git-commit: bb7d066a091654b6d6c0b6061bda438bf36c6613
Patch-mainline: v5.10-rc1
References: jsc#SLE-13821

Use __packed instead of __attribute__((packed))

Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Reviewed-by: Alexander Egorenkov <egorenar@linux.ibm.com>
Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
Acked-by: Petr Tesarik <ptesarik@suse.com>
---
 arch/s390/include/asm/stp.h |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- a/arch/s390/include/asm/stp.h
+++ b/arch/s390/include/asm/stp.h
@@ -6,6 +6,8 @@
 #ifndef __S390_STP_H
 #define __S390_STP_H
 
+#include <linux/compiler.h>
+
 /* notifier for syncs */
 extern struct atomic_notifier_head s390_epoch_delta_notifier;
 
@@ -16,7 +18,7 @@ struct stp_irq_parm {
 	unsigned int lac	: 1;	/* Link availability change */
 	unsigned int tcpc	: 1;	/* Time control parameter change */
 	unsigned int _pad2	: 15;
-} __attribute__ ((packed));
+} __packed;
 
 #define STP_OP_SYNC	1
 #define STP_OP_CTRL	3
@@ -42,7 +44,7 @@ struct stp_sstpi {
 	unsigned int rsvd5;
 	unsigned int todoff[4];
 	unsigned int rsvd6[48];
-} __attribute__ ((packed));
+} __packed;
 
 /* Functions needed by the machine check handler */
 int stp_sync_check(void);