[PATCH 06/12] m68k: drop pointless #if 0 block

Angelo Dureghello angelo at kernel-space.org
Thu Jun 5 10:45:02 CEST 2025


thanks,

Acked-by: Angelo Dureghello <angelo at kernel-space.org>

On Wed,  4 Jun 2025 21:56:06 +0200

Rasmus Villemoes <ravi at prevas.dk> wrote:

> The way DECLARE_GLOBAL_DATA_PTR is used, the stuff under #if 0 can
> never compile as you cannot have a non-constant initializer at global
> scope (and one would get linker errors as well because the 'gd' symbol
> would be defined in multiple TUs).
> 
> Signed-off-by: Rasmus Villemoes <ravi at prevas.dk>
> ---
>  arch/m68k/include/asm/global_data.h | 5 -----
>  1 file changed, 5 deletions(-)
> 
> diff --git a/arch/m68k/include/asm/global_data.h b/arch/m68k/include/asm/global_data.h
> index 29b46645676..aea2ccabe08 100644
> --- a/arch/m68k/include/asm/global_data.h
> +++ b/arch/m68k/include/asm/global_data.h
> @@ -32,11 +32,6 @@ struct arch_global_data {
>  
>  #include <asm-generic/global_data.h>
>  
> -#if 0
> -extern gd_t *global_data;
> -#define DECLARE_GLOBAL_DATA_PTR     gd_t *gd = global_data
> -#else
>  #define DECLARE_GLOBAL_DATA_PTR     register gd_t *gd asm ("d7")
> -#endif
>  
>  #endif /* __ASM_GBL_DATA_H */
> -- 
> 2.49.0
> 


More information about the U-Boot mailing list