From 5c8fd32b2295f4c502a526243ab253d1fd11c057 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 11 Nov 2018 12:31:01 +0200 Subject: Use _AC and UL macros from linux/const.h Drop the _AC and UL macros from common.h. Linux headers is the original source of this macro, so keep its definition in the same header. Update existing users of these macros to include const.h directly. Cc: Daniel Schwierzeck Cc: Rick Chen Reviewed-by: Tom Rini Reviewed-by: Rick Chen Signed-off-by: Baruch Siach Reviewed-by: Daniel Schwierzeck Signed-off-by: Stefan Roese --- arch/mips/include/asm/mach-generic/spaces.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/mips/include/asm') diff --git a/arch/mips/include/asm/mach-generic/spaces.h b/arch/mips/include/asm/mach-generic/spaces.h index b7eac323cd6..539d0a566d5 100644 --- a/arch/mips/include/asm/mach-generic/spaces.h +++ b/arch/mips/include/asm/mach-generic/spaces.h @@ -7,7 +7,7 @@ #ifndef _ASM_MACH_GENERIC_SPACES_H #define _ASM_MACH_GENERIC_SPACES_H -#include +#include /* * This gives the physical RAM offset. -- cgit v1.2.3 From 6d4d9bea35f0838a56751b50f48ade414639d372 Mon Sep 17 00:00:00 2001 From: Baruch Siach Date: Sun, 11 Nov 2018 12:31:02 +0200 Subject: MIPS: drop asm/const.h Commit 86f21c96f467368 (mips: Use common _AC macro now.) removed the _AC definition from const.h. All other macros defined in const.h are not used anywhere, and there is now no user of this header. Remove this header. Cc: Daniel Schwierzeck Signed-off-by: Baruch Siach Reviewed-by: Tom Rini Reviewed-by: Daniel Schwierzeck Signed-off-by: Stefan Roese --- arch/mips/include/asm/const.h | 27 --------------------------- 1 file changed, 27 deletions(-) delete mode 100644 arch/mips/include/asm/const.h (limited to 'arch/mips/include/asm') diff --git a/arch/mips/include/asm/const.h b/arch/mips/include/asm/const.h deleted file mode 100644 index ed43b5d534a..00000000000 --- a/arch/mips/include/asm/const.h +++ /dev/null @@ -1,27 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * const.h: Macros for dealing with constants. - */ - -#ifndef _LINUX_CONST_H -#define _LINUX_CONST_H - -/* Some constant macros are used in both assembler and - * C code. Therefore we cannot annotate them always with - * 'UL' and other type specifiers unilaterally. We - * use the following macros to deal with this. - * - * Similarly, _AT() will cast an expression with a type in C, but - * leave it unchanged in asm. - */ - -#ifdef __ASSEMBLY__ -#define _AT(T,X) X -#else -#define _AT(T,X) ((T)(X)) -#endif - -#define _BITUL(x) (_AC(1,UL) << (x)) -#define _BITULL(x) (_AC(1,ULL) << (x)) - -#endif /* !(_LINUX_CONST_H) */ -- cgit v1.2.3