Import the definitions from Linux. Some code actually used those already, defining them locally. As these are not needed now that there are common ones available, remove the duplicate definitions. While at it, also update _BITUL/_BITULL() definitions to align more with the latest Linux sources. Signed-off-by: Denis Orlov <denorl2009@xxxxxxxxx> --- arch/arm/include/asm/memory.h | 5 ----- arch/arm/include/asm/pgtable64.h | 2 -- arch/kvx/include/asm/sfr_defs.h | 2 -- include/linux/const.h | 10 ++++++++-- 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/arch/arm/include/asm/memory.h b/arch/arm/include/asm/memory.h index 2b454fa673..23fbbd8438 100644 --- a/arch/arm/include/asm/memory.h +++ b/arch/arm/include/asm/memory.h @@ -6,11 +6,6 @@ #include <memory.h> #include <linux/const.h> -/* - * Allow for constants defined here to be used from assembly code - * by prepending the UL suffix only with actual C code compilation. - */ -#define UL(x) _AC(x, UL) static inline int arm_add_mem_device(const char* name, resource_size_t start, resource_size_t size) diff --git a/arch/arm/include/asm/pgtable64.h b/arch/arm/include/asm/pgtable64.h index dbec61753b..21dac30cfe 100644 --- a/arch/arm/include/asm/pgtable64.h +++ b/arch/arm/include/asm/pgtable64.h @@ -4,8 +4,6 @@ #ifndef __ASM_PGTABLE64_H #define __ASM_PGTABLE64_H -#define UL(x) _AC(x, UL) - #define UNUSED_DESC 0x6EbAAD0BBADbA6E0 #define VA_START 0x0 diff --git a/arch/kvx/include/asm/sfr_defs.h b/arch/kvx/include/asm/sfr_defs.h index 2b7598e0aa..7f6fbd206b 100644 --- a/arch/kvx/include/asm/sfr_defs.h +++ b/arch/kvx/include/asm/sfr_defs.h @@ -8,8 +8,6 @@ #include <linux/const.h> -#define _ULL(X) _AC(X, ULL) - /* Register file indices */ #define KVX_SFR_PC 0 /* Program Counter $pc $s0 */ #define KVX_SFR_PS 1 /* Processor State $ps $s1 */ diff --git a/include/linux/const.h b/include/linux/const.h index 07f886d271..07414f95de 100644 --- a/include/linux/const.h +++ b/include/linux/const.h @@ -23,7 +23,13 @@ #define _AT(T,X) ((T)(X)) #endif -#define _BITUL(x) (_AC(1,UL) << (x)) -#define _BITULL(x) (_AC(1,ULL) << (x)) +#define _UL(x) (_AC(x, UL)) +#define _ULL(x) (_AC(x, ULL)) + +#define _BITUL(x) (_UL(1) << (x)) +#define _BITULL(x) (_ULL(1) << (x)) + +#define UL(x) (_UL(x)) +#define ULL(x) (_ULL(x)) #endif /* !(_LINUX_CONST_H) */ -- 2.41.0
