Message ID | 96642cf9ef608221bc750a022093488dbb360d46.1541932264.git.baruch@tkos.co.il |
---|---|
State | Accepted |
Commit | 5c8fd32b2295f4c502a526243ab253d1fd11c057 |
Delegated to: | Stefan Roese |
Headers | show |
Series | [U-Boot,v4,1/5] linux/const.h: import from kernel | expand |
Am So., 11. Nov. 2018 um 11:33 Uhr schrieb Baruch Siach <baruch@tkos.co.il>: > > 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 <daniel.schwierzeck@gmail.com> > Cc: Rick Chen <rick@andestech.com> > Reviewed-by: Tom Rini <trini@konsulko.com> > Reviewed-by: Rick Chen <rick@andestech.com> > Signed-off-by: Baruch Siach <baruch@tkos.co.il> > --- > v4: Squash the spaces.h change in to this commit > > v3: New patch in this series > --- > arch/arm/include/asm/armv8/mmu.h | 2 ++ > arch/mips/include/asm/mach-generic/spaces.h | 2 +- > arch/riscv/include/asm/csr.h | 2 ++ > include/common.h | 9 --------- > 4 files changed, 5 insertions(+), 10 deletions(-) > Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck@gmail.com>
diff --git a/arch/arm/include/asm/armv8/mmu.h b/arch/arm/include/asm/armv8/mmu.h index 62d00d15c26d..4a573208dfd0 100644 --- a/arch/arm/include/asm/armv8/mmu.h +++ b/arch/arm/include/asm/armv8/mmu.h @@ -7,6 +7,8 @@ #ifndef _ASM_ARMV8_MMU_H_ #define _ASM_ARMV8_MMU_H_ +#include <linux/const.h> + /* * block/section address mask and size definitions. */ diff --git a/arch/mips/include/asm/mach-generic/spaces.h b/arch/mips/include/asm/mach-generic/spaces.h index b7eac323cd67..539d0a566d52 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 <asm/const.h> +#include <linux/const.h> /* * This gives the physical RAM offset. diff --git a/arch/riscv/include/asm/csr.h b/arch/riscv/include/asm/csr.h index 50fccea5c8f9..29624fdbb555 100644 --- a/arch/riscv/include/asm/csr.h +++ b/arch/riscv/include/asm/csr.h @@ -8,6 +8,8 @@ #ifndef _ASM_RISCV_CSR_H #define _ASM_RISCV_CSR_H +#include <linux/const.h> + /* Status register flags */ #define SR_SIE _AC(0x00000002, UL) /* Supervisor Interrupt Enable */ #define SR_SPIE _AC(0x00000020, UL) /* Previous Supervisor IE */ diff --git a/include/common.h b/include/common.h index 83b3bdc58dfa..f3c1de9f1fa2 100644 --- a/include/common.h +++ b/include/common.h @@ -14,9 +14,6 @@ typedef volatile unsigned long vu_long; typedef volatile unsigned short vu_short; typedef volatile unsigned char vu_char; -/* Allow sharing constants with type modifiers between C and assembly. */ -#define _AC(X, Y) (X##Y) - #include <config.h> #include <errno.h> #include <time.h> @@ -542,16 +539,10 @@ int cpu_release(u32 nr, int argc, char * const argv[]); #else /* __ASSEMBLY__ */ -/* Drop a C type modifier (like in 3UL) for constants used in assembly. */ -#define _AC(X, Y) X - #endif /* __ASSEMBLY__ */ /* Put only stuff here that the assembler can digest */ -/* Declare an unsigned long constant digestable both by C and an assembler. */ -#define UL(x) _AC(x, UL) - #ifdef CONFIG_POST #define CONFIG_HAS_POST #ifndef CONFIG_POST_ALT_LIST