From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [PATCH 05/11] global: Rework architecture global_data.h to include <linux/types.h>
Date: Wed, 22 Nov 2023 08:11:48 -0500 [thread overview]
Message-ID: <20231122131154.2444690-5-trini@konsulko.com> (raw)
In-Reply-To: <20231122131154.2444690-1-trini@konsulko.com>
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(-)
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>
--
2.34.1
next prev parent reply other threads:[~2023-11-22 13:12 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-22 13:11 [PATCH 01/11] global: Remove duplicate common.h inclusions Tom Rini
2023-11-22 13:11 ` [PATCH 02/11] arm: Remove <asm/types.h> from asm/global_data.h Tom Rini
2023-12-02 18:23 ` Simon Glass
2023-11-22 13:11 ` [PATCH 03/11] sandbox: Add <linux/types.h> to asm/global_data.h and asm/io.h Tom Rini
2023-11-30 2:45 ` Simon Glass
2023-11-22 13:11 ` [PATCH 04/11] m68k: Rework asm/global_data.h slightly Tom Rini
2023-11-22 21:04 ` Angelo Dureghello
2023-11-22 21:09 ` Tom Rini
2023-11-23 20:44 ` Angelo Dureghello
2023-11-22 13:11 ` Tom Rini [this message]
2023-12-02 18:23 ` [PATCH 05/11] global: Rework architecture global_data.h to include <linux/types.h> Simon Glass
2023-11-22 13:11 ` [PATCH 06/11] lib/sha*.c: Update header list Tom Rini
2023-12-02 18:23 ` Simon Glass
2023-12-09 15:48 ` Tom Rini
2023-11-22 13:11 ` [PATCH 07/11] rmobile: Add <mach/rmobile.h> to cpu_info-rzg2l.c Tom Rini
2023-11-22 16:15 ` Marek Vasut
2023-11-22 13:11 ` [PATCH 08/11] efi_loader: Remove <common.h> Tom Rini
2023-11-22 13:46 ` Ilias Apalodimas
2023-11-22 13:11 ` [PATCH 09/11] display_options: Clean up headers Tom Rini
2023-11-30 2:45 ` Simon Glass
2023-11-22 13:11 ` [PATCH 10/11] include: Further cleanup includes Tom Rini
2023-12-02 18:23 ` Simon Glass
2023-11-22 13:11 ` [PATCH 11/11] lib: Remove <common.h> inclusion from these files Tom Rini
2023-12-01 18:44 ` Simon Glass
2023-12-02 18:23 ` [PATCH 01/11] global: Remove duplicate common.h inclusions Simon Glass
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231122131154.2444690-5-trini@konsulko.com \
--to=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox