Re: [PATCH 3/3] xen/EFI: Drop __ASSEMBLY__ ifdefary in efi.h

[Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx>]

On Thu, Jun 05, 2025 at 12:16:38PM +0100, Andrew Cooper wrote:
> There's already C outside of the ifdefary, proving that it's not included in
> any assembly files.
> 
> No functional change.
> 
> Signed-off-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>

Acked-by: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx>

> ---
> CC: Jan Beulich <JBeulich@xxxxxxxx>
> CC: Roger Pau Monné <roger.pau@xxxxxxxxxx>
> CC: Ross Lagerwall <ross.lagerwall@xxxxxxxxxx>
> CC: Marek Marczykowski-Górecki <marmarek@xxxxxxxxxxxxxxxxxxxxxx>
> CC: Daniel P. Smith <dpsmith@xxxxxxxxxxxxxxxxxxxx>
> ---
>  xen/include/xen/efi.h | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/xen/include/xen/efi.h b/xen/include/xen/efi.h
> index 160804e29444..623ed2ccdf31 100644
> --- a/xen/include/xen/efi.h
> +++ b/xen/include/xen/efi.h
> @@ -1,9 +1,7 @@
>  #ifndef __XEN_EFI_H__
>  #define __XEN_EFI_H__
>  
> -#ifndef __ASSEMBLY__
>  #include <xen/types.h>
> -#endif
>  
>  #define EFI_INVALID_TABLE_ADDR (~0UL)
>  
> @@ -23,8 +21,6 @@ struct efi {
>  
>  extern struct efi efi;
>  
> -#ifndef __ASSEMBLY__
> -
>  union xenpf_efi_info;
>  union compat_pf_efi_info;
>  
> @@ -53,6 +49,4 @@ int efi_runtime_call(struct xenpf_efi_runtime_call *op);
>  int efi_compat_get_info(uint32_t idx, union compat_pf_efi_info *info);
>  int efi_compat_runtime_call(struct compat_pf_efi_runtime_call *op);
>  
> -#endif /* !__ASSEMBLY__ */
> -
>  #endif /* __XEN_EFI_H__ */
> -- 
> 2.39.5
> 

-- 
Best Regards,
Marek Marczykowski-Górecki
Invisible Things Lab

Attachment: signature.asc
Description: PGP signature