When the structure or symbol definition name contains "x64" or "arm64", such conflicts won't occur, and the #ifdef isn't needed. This does means that when compiling for either x86 or arm64, the symbols from both architectures will be visible in the symbol namespace, but that shouldn't cause any problems. So it looks to me like none of the #ifdef's in this patch are needed. Nuno -- please jump in if I have misunderstood. Michael [1] https://lore.kernel.org/linux-hyperv/SN6PR02MB4157AA30A9F27ECCAE202BC2D4582@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx/ > struct hv_x64_segment_register { > u64 base; > u32 limit; > @@ -807,6 +809,8 @@ struct hv_x64_table_register { > u64 base; > } __packed; > > +#endif > + > union hv_input_vtl { > u8 as_uint8; > struct { > @@ -1068,6 +1072,41 @@ union hv_dispatch_suspend_register { > } __packed; > }; > > +#if defined(CONFIG_ARM64) > + > +union hv_arm64_pending_interruption_register { > + u64 as_uint64; > + struct { > + u64 interruption_pending : 1; > + u64 interruption_type : 1; > + u64 reserved : 30; > + u32 error_code; > + } __packed; > +}; > + > +union hv_arm64_interrupt_state_register { > + u64 as_uint64; > + struct { > + u64 interrupt_shadow : 1; > + u64 reserved : 63; > + } __packed; > +}; > + > +union hv_arm64_pending_synthetic_exception_event { > + u64 as_uint64[2]; > + struct { > + u32 event_pending : 1; > + u32 event_type : 3; > + u32 reserved : 4; > + u32 exception_type; > + u64 context; > + } __packed; > +}; > + > +#endif > + > +#if defined(CONFIG_X86) > + > union hv_x64_interrupt_state_register { > u64 as_uint64; > struct { > @@ -1091,6 +1130,8 @@ union hv_x64_pending_interruption_register { > } __packed; > }; > > +#endif > + > union hv_register_value { > struct hv_u128 reg128; > u64 reg64; > @@ -1098,13 +1139,33 @@ union hv_register_value { > u16 reg16; > u8 reg8; > > - struct hv_x64_segment_register segment; > - struct hv_x64_table_register table; > union hv_explicit_suspend_register explicit_suspend; > union hv_intercept_suspend_register intercept_suspend; > union hv_dispatch_suspend_register dispatch_suspend; > +#if defined(CONFIG_X86) > + struct hv_x64_segment_register segment; > + struct hv_x64_table_register table; > union hv_x64_interrupt_state_register interrupt_state; > union hv_x64_pending_interruption_register pending_interruption; > +#endif > +#if defined(CONFIG_ARM64) > + union hv_arm64_pending_interruption_register pending_interruption; > + union hv_arm64_interrupt_state_register interrupt_state; > + union hv_arm64_pending_synthetic_exception_event > pending_synthetic_exception_event; > +#endif > +}; > + > +/* > + * NOTE: Linux helper struct - NOT from Hyper-V code. > + * DECLARE_FLEX_ARRAY() needs to be wrapped into > + * a structure and have at least one more member besides > + * DECLARE_FLEX_ARRAY. > + */ > +struct hv_output_get_vp_registers { > + struct { > + DECLARE_FLEX_ARRAY(union hv_register_value, values); > + struct {} values_end; > + }; > }; > > #if defined(CONFIG_ARM64) > -- > 2.34.1
