From 15a93de4641d882e26cf1de50af69679c1a20aee Mon Sep 17 00:00:00 2001 From: Vincent Donnefort Date: Wed, 20 Dec 2023 16:18:05 +0000 Subject: [PATCH] ANDROID: KVM: arm64: Fix hyp event alignment The structures that define hyp events must be packed so they match their format definitions in the tracefs file hyp/events/hyp//format. Bug: 299430621 Change-Id: Ia7e1a686744d5c9c3f8a21881f03228c8acecade Signed-off-by: Vincent Donnefort --- arch/arm64/include/asm/kvm_hypevents_defs.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm64/include/asm/kvm_hypevents_defs.h b/arch/arm64/include/asm/kvm_hypevents_defs.h index e228d894a898..606f3477ecd3 100644 --- a/arch/arm64/include/asm/kvm_hypevents_defs.h +++ b/arch/arm64/include/asm/kvm_hypevents_defs.h @@ -15,10 +15,10 @@ struct hyp_entry_hdr { /* * Hyp events definitions common to the hyp and the host */ -#define HYP_EVENT_FORMAT(__name, __struct) \ - struct trace_hyp_format_##__name { \ - struct hyp_entry_hdr hdr; \ - __struct \ +#define HYP_EVENT_FORMAT(__name, __struct) \ + struct __packed trace_hyp_format_##__name { \ + struct hyp_entry_hdr hdr; \ + __struct \ } #define HE_PROTO(args...) args