[bionic:linux-azure-4.15][PATCH 3/5] PCI: hv: Add __aligned(8) to struct retarget_msi_interrupt

Marcelo Henrique Cerri marcelo.cerri at canonical.com
Sun Apr 26 20:42:27 UTC 2020


From: Maya Nakamura <m.maya.nakamura at gmail.com>

BugLink: https://bugs.launchpad.net/bugs/1867220

Because Hyper-V requires that hypercall arguments be aligned on an 8
byte boundary, add __aligned(8) to struct retarget_msi_interrupt.

Link: https://lore.kernel.org/lkml/87k1hlqlby.fsf@vitty.brq.redhat.com/
Signed-off-by: Maya Nakamura <m.maya.nakamura at gmail.com>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi at arm.com>
(backported from commit 6ae91579061c25f70e4301619ffd16e1b6b5defb)
[marcelo.cerri at canonical.com: basically a clean cherry-pick, but the
 changes from drivers/pci/controller/pci-hyperv.c had to be applied
 to drivers/pci/host/pci-hyperv.c instead]
Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri at canonical.com>
---
 drivers/pci/host/pci-hyperv.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c
index d7df3aa1860e..a592b029fe34 100644
--- a/drivers/pci/host/pci-hyperv.c
+++ b/drivers/pci/host/pci-hyperv.c
@@ -430,7 +430,7 @@ struct retarget_msi_interrupt {
 	struct hv_interrupt_entry int_entry;
 	u64	reserved2;
 	struct hv_device_interrupt_target int_target;
-} __packed;
+} __packed __aligned(8);
 
 /*
  * Driver specific state.
-- 
2.25.1




More information about the kernel-team mailing list