diff --git a/arch/s390/include/asm/diag.h b/arch/s390/include/asm/diag.h
index 9488b7ffb21cf875e9bd7509fcb4c21e3ca796d0..674a939f16ee6fb1f8f2f4e3efd76662aa375a35 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);