[PATCH v2 14/24] scsi: ipr: Fix struct packed-not-aligned issues

From: Lee Jones
Date: Mon Jul 13 2020 - 04:01:15 EST


Fixes the following W=1 kernel build warning(s):

drivers/scsi/ipr.h:1687:1: warning: alignment 1 of âstruct ipr_dump_location_entryâ is less than 4 [-Wpacked-not-aligned]
1687 | }__attribute__((packed));
| ^
drivers/scsi/ipr.h:1711:1: warning: alignment 1 of âstruct ipr_driver_dumpâ is less than 4 [-Wpacked-not-aligned]
1711 | }__attribute__((packed));
| ^

Cc: Brian King <brking@xxxxxxxxxx>
Cc: Alan Cox <alan@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx>
---
drivers/scsi/ipr.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/scsi/ipr.h b/drivers/scsi/ipr.h
index 9a0d3d7293206..783ee03ad9ea2 100644
--- a/drivers/scsi/ipr.h
+++ b/drivers/scsi/ipr.h
@@ -1684,7 +1684,7 @@ struct ipr_dump_entry_header {
struct ipr_dump_location_entry {
struct ipr_dump_entry_header hdr;
u8 location[20];
-}__attribute__((packed));
+}__attribute__((packed, aligned (4)));

struct ipr_dump_trace_entry {
struct ipr_dump_entry_header hdr;
@@ -1708,7 +1708,7 @@ struct ipr_driver_dump {
struct ipr_dump_location_entry location_entry;
struct ipr_dump_ioa_type_entry ioa_type_entry;
struct ipr_dump_trace_entry trace_entry;
-}__attribute__((packed));
+}__attribute__((packed, aligned (4)));

struct ipr_ioa_dump {
struct ipr_dump_entry_header hdr;
--
2.25.1