| Message ID | 20231122131154.2444690-5-trini@konsulko.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [01/11] global: Remove duplicate common.h inclusions | expand |
On Wed, 22 Nov 2023 at 06:12, Tom Rini <trini@konsulko.com> wrote: > > In most cases, the architecture global data currently makes use of > assorted linux types, but does not include <linux/types.h> to provide > them. Add <linux/types.h> instead of relying on indirect inclusion. > > Signed-off-by: Tom Rini <trini@konsulko.com> > --- > arch/mips/include/asm/global_data.h | 2 +- > arch/nios2/include/asm/global_data.h | 2 ++ > arch/powerpc/include/asm/global_data.h | 3 +-- > arch/riscv/include/asm/global_data.h | 1 + > arch/x86/include/asm/global_data.h | 1 + > 5 files changed, 6 insertions(+), 3 deletions(-) > Reviewed-by: Simon Glass <sjg@chromium.org>
diff --git a/arch/mips/include/asm/global_data.h b/arch/mips/include/asm/global_data.h index f0d3b07bf1eb..34b7e0bed945 100644 --- a/arch/mips/include/asm/global_data.h +++ b/arch/mips/include/asm/global_data.h @@ -7,8 +7,8 @@ #ifndef __ASM_GBL_DATA_H #define __ASM_GBL_DATA_H +#include <linux/types.h> #include <asm/regdef.h> -#include <asm/types.h> struct octeon_eeprom_mac_addr { u8 mac_addr_base[6]; diff --git a/arch/nios2/include/asm/global_data.h b/arch/nios2/include/asm/global_data.h index 1a0e7d25fa3b..b56e8a5078e0 100644 --- a/arch/nios2/include/asm/global_data.h +++ b/arch/nios2/include/asm/global_data.h @@ -6,6 +6,8 @@ #ifndef __ASM_NIOS2_GLOBALDATA_H_ #define __ASM_NIOS2_GLOBALDATA_H_ +#include <linux/types.h> + /* Architecture-specific global data */ struct arch_global_data { u32 dcache_line_size; diff --git a/arch/powerpc/include/asm/global_data.h b/arch/powerpc/include/asm/global_data.h index 6ed21c781fe4..f7860122a00b 100644 --- a/arch/powerpc/include/asm/global_data.h +++ b/arch/powerpc/include/asm/global_data.h @@ -8,8 +8,7 @@ #ifndef __ASM_GBL_DATA_H #define __ASM_GBL_DATA_H -#include <config.h> -#include "asm/types.h" +#include <linux/types.h> /* Architecture-specific global data */ struct arch_global_data { diff --git a/arch/riscv/include/asm/global_data.h b/arch/riscv/include/asm/global_data.h index 937fa4d15446..d00247ad9536 100644 --- a/arch/riscv/include/asm/global_data.h +++ b/arch/riscv/include/asm/global_data.h @@ -10,6 +10,7 @@ #ifndef __ASM_GBL_DATA_H #define __ASM_GBL_DATA_H +#include <linux/types.h> #include <asm/smp.h> #include <asm/u-boot.h> #include <compiler.h> diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index 6f4a7130f1da..1ef7f1f0349e 100644 --- a/arch/x86/include/asm/global_data.h +++ b/arch/x86/include/asm/global_data.h @@ -9,6 +9,7 @@ #ifndef __ASSEMBLY__ +#include <linux/types.h> #include <asm/processor.h> #include <asm/mrccache.h>
In most cases, the architecture global data currently makes use of assorted linux types, but does not include <linux/types.h> to provide them. Add <linux/types.h> instead of relying on indirect inclusion. Signed-off-by: Tom Rini <trini@konsulko.com> --- arch/mips/include/asm/global_data.h | 2 +- arch/nios2/include/asm/global_data.h | 2 ++ arch/powerpc/include/asm/global_data.h | 3 +-- arch/riscv/include/asm/global_data.h | 1 + arch/x86/include/asm/global_data.h | 1 + 5 files changed, 6 insertions(+), 3 deletions(-)