From e66d7fc089912a8f84bbbfa4a69eb5c0ebaa1e1d Mon Sep 17 00:00:00 2001 From: Rasmus Villemoes Date: Wed, 4 Jun 2025 21:56:05 +0200 Subject: m68k: drop volatile qualifier from gd pointer Signed-off-by: Rasmus Villemoes --- arch/m68k/include/asm/global_data.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/m68k/include/asm/global_data.h') diff --git a/arch/m68k/include/asm/global_data.h b/arch/m68k/include/asm/global_data.h index 4ac886933c6..29b46645676 100644 --- a/arch/m68k/include/asm/global_data.h +++ b/arch/m68k/include/asm/global_data.h @@ -36,7 +36,7 @@ struct arch_global_data { extern gd_t *global_data; #define DECLARE_GLOBAL_DATA_PTR gd_t *gd = global_data #else -#define DECLARE_GLOBAL_DATA_PTR register volatile gd_t *gd asm ("d7") +#define DECLARE_GLOBAL_DATA_PTR register gd_t *gd asm ("d7") #endif #endif /* __ASM_GBL_DATA_H */ -- cgit v1.2.3 From a6f3d70a6bc2f99ac86f47bc5697d7e6e36ea7b8 Mon Sep 17 00:00:00 2001 From: Rasmus Villemoes Date: Wed, 4 Jun 2025 21:56:06 +0200 Subject: m68k: drop pointless #if 0 block 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 Acked-by: Angelo Dureghello --- arch/m68k/include/asm/global_data.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'arch/m68k/include/asm/global_data.h') 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 -#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 */ -- cgit v1.2.3