| Message ID | 20200510113946.v3.15.I470731da548fee846f1d7f35a1330a9de6f590c1@changeid |
|---|---|
| State | Accepted |
| Commit | 25a5818ff8f17420982e682c4282fcfe8405385e |
| Headers | show |
| Series | common: Further reduce the size of common.h | expand |
On Sun, May 10, 2020 at 11:40:06AM -0600, Simon Glass wrote: > Move this uncommon header out of the common header. > > Signed-off-by: Simon Glass <sjg at chromium.org> Applied to u-boot/master, thanks!
diff --git a/arch/arm/cpu/arm1136/mx35/timer.c b/arch/arm/cpu/arm1136/mx35/timer.c index cb351ecf76..f2541c398d 100644 --- a/arch/arm/cpu/arm1136/mx35/timer.c +++ b/arch/arm/cpu/arm1136/mx35/timer.c @@ -11,6 +11,7 @@ #include <asm/io.h> #include <asm/arch/imx-regs.h> #include <asm/arch/crm_regs.h> +#include <asm/ptrace.h> /* General purpose timers bitfields */ #define GPTCR_SWR (1<<15) /* Software reset */ diff --git a/arch/arm/cpu/arm926ejs/mx25/timer.c b/arch/arm/cpu/arm926ejs/mx25/timer.c index 7e2698b605..4b726d5c73 100644 --- a/arch/arm/cpu/arm926ejs/mx25/timer.c +++ b/arch/arm/cpu/arm926ejs/mx25/timer.c @@ -23,6 +23,7 @@ #include <init.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> +#include <asm/ptrace.h> /* nothing really to do with interrupts, just starts up a counter. */ /* The 32KHz 32-bit timer overruns in 134217 seconds */ diff --git a/arch/arm/cpu/arm926ejs/mx27/timer.c b/arch/arm/cpu/arm926ejs/mx27/timer.c index 193588ea10..d6e1e09f93 100644 --- a/arch/arm/cpu/arm926ejs/mx27/timer.c +++ b/arch/arm/cpu/arm926ejs/mx27/timer.c @@ -21,6 +21,7 @@ #include <time.h> #include <asm/io.h> #include <asm/arch/imx-regs.h> +#include <asm/ptrace.h> /* General purpose timers bitfields */ #define GPTCR_SWR (1 << 15) /* Software reset */ diff --git a/arch/arm/cpu/arm926ejs/spear/spl.c b/arch/arm/cpu/arm926ejs/spear/spl.c index 7b14ba05b4..08b98a2d06 100644 --- a/arch/arm/cpu/arm926ejs/spear/spl.c +++ b/arch/arm/cpu/arm926ejs/spear/spl.c @@ -11,6 +11,7 @@ #include <spl.h> #include <version.h> #include <asm/io.h> +#include <asm/ptrace.h> #include <asm/arch/hardware.h> #include <asm/arch/spr_defs.h> #include <asm/arch/spr_misc.h> diff --git a/arch/arm/cpu/arm926ejs/spear/timer.c b/arch/arm/cpu/arm926ejs/spear/timer.c index 9db1c74b36..6803c349e8 100644 --- a/arch/arm/cpu/arm926ejs/spear/timer.c +++ b/arch/arm/cpu/arm926ejs/spear/timer.c @@ -11,6 +11,7 @@ #include <asm/arch/hardware.h> #include <asm/arch/spr_gpt.h> #include <asm/arch/spr_misc.h> +#include <asm/ptrace.h> #define GPT_RESOLUTION (CONFIG_SPEAR_HZ_CLOCK / CONFIG_SPEAR_HZ) #define READ_TIMER() (readl(&gpt_regs_p->count) & GPT_FREE_RUNNING) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index a7f1e3f801..3e8359a3cd 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -15,6 +15,7 @@ #include <vsprintf.h> #include <asm/cache.h> #include <asm/io.h> +#include <asm/ptrace.h> #include <linux/errno.h> #include <asm/system.h> #include <fm_eth.h> diff --git a/arch/arm/cpu/armv8/sec_firmware.c b/arch/arm/cpu/armv8/sec_firmware.c index 789f9ca566..bfc0fac3ef 100644 --- a/arch/arm/cpu/armv8/sec_firmware.c +++ b/arch/arm/cpu/armv8/sec_firmware.c @@ -10,6 +10,7 @@ #include <image.h> #include <log.h> #include <asm/cache.h> +#include <asm/ptrace.h> #include <linux/kernel.h> #include <asm/io.h> #include <asm/system.h> diff --git a/arch/arm/lib/interrupts.c b/arch/arm/lib/interrupts.c index 36299d6e54..703be5a320 100644 --- a/arch/arm/lib/interrupts.c +++ b/arch/arm/lib/interrupts.c @@ -23,6 +23,7 @@ #include <efi_loader.h> #include <irq_func.h> #include <asm/proc-armv/ptrace.h> +#include <asm/ptrace.h> #include <asm/u-boot-arm.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/arm/lib/interrupts_64.c b/arch/arm/lib/interrupts_64.c index a2df7cf193..5299489013 100644 --- a/arch/arm/lib/interrupts_64.c +++ b/arch/arm/lib/interrupts_64.c @@ -5,6 +5,7 @@ */ #include <common.h> +#include <asm/ptrace.h> #include <irq_func.h> #include <linux/compiler.h> #include <efi_loader.h> diff --git a/arch/arm/mach-imx/sip.c b/arch/arm/mach-imx/sip.c index a4f0ab4886..6cb8179ee8 100644 --- a/arch/arm/mach-imx/sip.c +++ b/arch/arm/mach-imx/sip.c @@ -6,6 +6,7 @@ #include <common.h> #include <asm/arch/sys_proto.h> #include <asm/cache.h> +#include <asm/ptrace.h> unsigned long call_imx_sip(unsigned long id, unsigned long reg0, unsigned long reg1, unsigned long reg2, diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c index 3a7cffcab3..9d8668b2de 100644 --- a/arch/arm/mach-meson/board-common.c +++ b/arch/arm/mach-meson/board-common.c @@ -10,6 +10,7 @@ #include <asm/arch/boot.h> #include <env.h> #include <asm/cache.h> +#include <asm/ptrace.h> #include <linux/libfdt.h> #include <linux/err.h> #include <asm/arch/mem.h> diff --git a/arch/arm/mach-meson/sm.c b/arch/arm/mach-meson/sm.c index e6da4de534..dd660769e2 100644 --- a/arch/arm/mach-meson/sm.c +++ b/arch/arm/mach-meson/sm.c @@ -11,6 +11,7 @@ #include <log.h> #include <asm/arch/sm.h> #include <asm/cache.h> +#include <asm/ptrace.h> #include <linux/err.h> #include <linux/kernel.h> #include <dm.h> diff --git a/arch/arm/mach-mvebu/arm64-common.c b/arch/arm/mach-mvebu/arm64-common.c index 3a92a55a49..c8c065e93c 100644 --- a/arch/arm/mach-mvebu/arm64-common.c +++ b/arch/arm/mach-mvebu/arm64-common.c @@ -8,6 +8,7 @@ #include <fdtdec.h> #include <init.h> #include <asm/cache.h> +#include <asm/ptrace.h> #include <linux/libfdt.h> #include <linux/sizes.h> #include <pci.h> diff --git a/arch/arm/mach-mvebu/armada8k/dram.c b/arch/arm/mach-mvebu/armada8k/dram.c index 265a8b0ae8..3da9fa589d 100644 --- a/arch/arm/mach-mvebu/armada8k/dram.c +++ b/arch/arm/mach-mvebu/armada8k/dram.c @@ -6,6 +6,7 @@ #include <common.h> #include <asm/arch/cpu.h> #include <asm/arch/soc.h> +#include <asm/ptrace.h> #include <asm/system.h> #include <linux/sizes.h> diff --git a/arch/m68k/lib/interrupts.c b/arch/m68k/lib/interrupts.c index ddc91993a1..1caef61d20 100644 --- a/arch/m68k/lib/interrupts.c +++ b/arch/m68k/lib/interrupts.c @@ -12,6 +12,7 @@ #include <watchdog.h> #include <asm/processor.h> #include <asm/immap.h> +#include <asm/ptrace.h> #define NR_IRQS (CONFIG_SYS_NUM_IRQS) diff --git a/arch/m68k/lib/traps.c b/arch/m68k/lib/traps.c index 2ccd55add0..c49141f376 100644 --- a/arch/m68k/lib/traps.c +++ b/arch/m68k/lib/traps.c @@ -12,6 +12,7 @@ #include <watchdog.h> #include <command.h> #include <asm/processor.h> +#include <asm/ptrace.h> extern void _exc_handler(void); diff --git a/arch/mips/lib/traps.c b/arch/mips/lib/traps.c index 20025b2199..b1ae02fcab 100644 --- a/arch/mips/lib/traps.c +++ b/arch/mips/lib/traps.c @@ -11,6 +11,7 @@ */ #include <common.h> +#include <asm/ptrace.h> #include <cpu_func.h> #include <hang.h> #include <init.h> diff --git a/arch/powerpc/cpu/mpc83xx/interrupts.c b/arch/powerpc/cpu/mpc83xx/interrupts.c index 8d525dc837..d04f31df50 100644 --- a/arch/powerpc/cpu/mpc83xx/interrupts.c +++ b/arch/powerpc/cpu/mpc83xx/interrupts.c @@ -11,6 +11,7 @@ #include <irq_func.h> #include <mpc83xx.h> #include <asm/processor.h> +#include <asm/ptrace.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/powerpc/cpu/mpc83xx/traps.c b/arch/powerpc/cpu/mpc83xx/traps.c index 1c6c38b15f..c3cc119d65 100644 --- a/arch/powerpc/cpu/mpc83xx/traps.c +++ b/arch/powerpc/cpu/mpc83xx/traps.c @@ -12,6 +12,7 @@ */ #include <common.h> +#include <asm/ptrace.h> #include <command.h> #include <kgdb.h> #include <asm/processor.h> diff --git a/arch/powerpc/cpu/mpc85xx/interrupts.c b/arch/powerpc/cpu/mpc85xx/interrupts.c index e9da9c0d48..4ad762683f 100644 --- a/arch/powerpc/cpu/mpc85xx/interrupts.c +++ b/arch/powerpc/cpu/mpc85xx/interrupts.c @@ -21,6 +21,7 @@ #ifdef CONFIG_POST #include <post.h> #endif +#include <asm/ptrace.h> void interrupt_init_cpu(unsigned *decrementer_count) { diff --git a/arch/powerpc/cpu/mpc85xx/traps.c b/arch/powerpc/cpu/mpc85xx/traps.c index bc2fc93e11..f37a45e269 100644 --- a/arch/powerpc/cpu/mpc85xx/traps.c +++ b/arch/powerpc/cpu/mpc85xx/traps.c @@ -20,6 +20,7 @@ */ #include <common.h> +#include <asm/ptrace.h> #include <command.h> #include <init.h> #include <irq_func.h> diff --git a/arch/powerpc/cpu/mpc86xx/interrupts.c b/arch/powerpc/cpu/mpc86xx/interrupts.c index 033ca327f0..5a916600ed 100644 --- a/arch/powerpc/cpu/mpc86xx/interrupts.c +++ b/arch/powerpc/cpu/mpc86xx/interrupts.c @@ -24,6 +24,7 @@ #ifdef CONFIG_POST #include <post.h> #endif +#include <asm/ptrace.h> void interrupt_init_cpu(unsigned *decrementer_count) { diff --git a/arch/powerpc/cpu/mpc86xx/traps.c b/arch/powerpc/cpu/mpc86xx/traps.c index 79bab91367..c0161e3379 100644 --- a/arch/powerpc/cpu/mpc86xx/traps.c +++ b/arch/powerpc/cpu/mpc86xx/traps.c @@ -14,6 +14,7 @@ */ #include <common.h> +#include <asm/ptrace.h> #include <command.h> #include <init.h> #include <kgdb.h> diff --git a/arch/powerpc/cpu/mpc8xx/interrupts.c b/arch/powerpc/cpu/mpc8xx/interrupts.c index 3efe8956ec..eef1951f2f 100644 --- a/arch/powerpc/cpu/mpc8xx/interrupts.c +++ b/arch/powerpc/cpu/mpc8xx/interrupts.c @@ -12,6 +12,7 @@ #include <asm/cpm_8xx.h> #include <asm/processor.h> #include <asm/io.h> +#include <asm/ptrace.h> /************************************************************************/ diff --git a/arch/powerpc/cpu/mpc8xx/traps.c b/arch/powerpc/cpu/mpc8xx/traps.c index 899bcd8618..56794b08a1 100644 --- a/arch/powerpc/cpu/mpc8xx/traps.c +++ b/arch/powerpc/cpu/mpc8xx/traps.c @@ -16,6 +16,7 @@ */ #include <common.h> +#include <asm/ptrace.h> #include <command.h> #include <asm/processor.h> diff --git a/arch/powerpc/lib/interrupts.c b/arch/powerpc/lib/interrupts.c index 64ee0cc210..73f270002c 100644 --- a/arch/powerpc/lib/interrupts.c +++ b/arch/powerpc/lib/interrupts.c @@ -14,6 +14,7 @@ #ifdef CONFIG_LED_STATUS #include <status_led.h> #endif +#include <asm/ptrace.h> #ifndef CONFIG_MPC83XX_TIMER #ifndef CONFIG_SYS_WATCHDOG_FREQ diff --git a/arch/powerpc/lib/kgdb.c b/arch/powerpc/lib/kgdb.c index 4a3e26cffc..8727d18884 100644 --- a/arch/powerpc/lib/kgdb.c +++ b/arch/powerpc/lib/kgdb.c @@ -1,6 +1,7 @@ #include <common.h> #include <command.h> #include <kgdb.h> +#include <asm/ptrace.h> #include <asm/signal.h> #include <asm/processor.h> diff --git a/arch/x86/cpu/i386/interrupt.c b/arch/x86/cpu/i386/interrupt.c index e67a116ac1..c0c4bc95fd 100644 --- a/arch/x86/cpu/i386/interrupt.c +++ b/arch/x86/cpu/i386/interrupt.c @@ -23,6 +23,7 @@ #include <asm/io.h> #include <asm/lapic.h> #include <asm/processor-flags.h> +#include <asm/ptrace.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/arch/xtensa/cpu/exceptions.c b/arch/xtensa/cpu/exceptions.c index 3b8f4a36d3..cf9af4326a 100644 --- a/arch/xtensa/cpu/exceptions.c +++ b/arch/xtensa/cpu/exceptions.c @@ -13,6 +13,7 @@ #include <common.h> #include <command.h> #include <irq_func.h> +#include <asm/ptrace.h> #include <asm/string.h> #include <asm/regs.h> diff --git a/board/cavium/thunderx/atf.c b/board/cavium/thunderx/atf.c index f01ead4e23..64aa198765 100644 --- a/board/cavium/thunderx/atf.c +++ b/board/cavium/thunderx/atf.c @@ -7,6 +7,7 @@ #include <command.h> #include <asm/cache.h> #include <asm/io.h> +#include <asm/ptrace.h> #include <asm/system.h> #include <cavium/thunderx_svc.h> diff --git a/board/xilinx/zynqmp/zynqmp.c b/board/xilinx/zynqmp/zynqmp.c index e880db1f81..fd6652ac3d 100644 --- a/board/xilinx/zynqmp/zynqmp.c +++ b/board/xilinx/zynqmp/zynqmp.c @@ -23,6 +23,7 @@ #include <asm/arch/psu_init_gpl.h> #include <asm/cache.h> #include <asm/io.h> +#include <asm/ptrace.h> #include <dm/device.h> #include <dm/uclass.h> #include <usb.h> diff --git a/cmd/bedbug.c b/cmd/bedbug.c index 425ba4af1f..81ce256480 100644 --- a/cmd/bedbug.c +++ b/cmd/bedbug.c @@ -6,6 +6,7 @@ #include <cli.h> #include <command.h> #include <console.h> +#include <asm/ptrace.h> #include <linux/ctype.h> #include <net.h> #include <bedbug/type.h> diff --git a/common/bedbug.c b/common/bedbug.c index 42ecf61eff..18a35ca23e 100644 --- a/common/bedbug.c +++ b/common/bedbug.c @@ -1,6 +1,7 @@ /* $Id$ */ #include <common.h> +#include <asm/ptrace.h> #include <linux/ctype.h> #include <bedbug/bedbug.h> diff --git a/common/kgdb.c b/common/kgdb.c index 312e14960a..4493a15919 100644 --- a/common/kgdb.c +++ b/common/kgdb.c @@ -88,6 +88,7 @@ ****************************************************************************/ #include <common.h> +#include <asm/ptrace.h> #include <kgdb.h> #include <command.h> diff --git a/common/kgdb_stubs.c b/common/kgdb_stubs.c index c061126bed..66aed7cea1 100644 --- a/common/kgdb_stubs.c +++ b/common/kgdb_stubs.c @@ -11,6 +11,7 @@ #include <cpu_func.h> #include <kgdb.h> #include <serial.h> +#include <asm/ptrace.h> int (*debugger_exception_handler)(struct pt_regs *); diff --git a/drivers/clk/clk_versal.c b/drivers/clk/clk_versal.c index 0b1d45bdae..2fb3171d71 100644 --- a/drivers/clk/clk_versal.c +++ b/drivers/clk/clk_versal.c @@ -7,6 +7,7 @@ #include <common.h> #include <log.h> #include <asm/cache.h> +#include <asm/ptrace.h> #include <dm/device_compat.h> #include <linux/bitops.h> #include <linux/bitfield.h> diff --git a/drivers/firmware/firmware-zynqmp.c b/drivers/firmware/firmware-zynqmp.c index 41089712b0..2bdf7771f6 100644 --- a/drivers/firmware/firmware-zynqmp.c +++ b/drivers/firmware/firmware-zynqmp.c @@ -10,6 +10,7 @@ #include <log.h> #include <zynqmp_firmware.h> #include <asm/cache.h> +#include <asm/ptrace.h> #if defined(CONFIG_ZYNQMP_IPI) #include <mailbox.h> diff --git a/drivers/timer/mpc83xx_timer.c b/drivers/timer/mpc83xx_timer.c index 3ef56f144e..186fe2b45a 100644 --- a/drivers/timer/mpc83xx_timer.c +++ b/drivers/timer/mpc83xx_timer.c @@ -14,6 +14,7 @@ #include <time.h> #include <timer.h> #include <watchdog.h> +#include <asm/ptrace.h> DECLARE_GLOBAL_DATA_PTR; diff --git a/include/common.h b/include/common.h index b698e35fec..395d1d3901 100644 --- a/include/common.h +++ b/include/common.h @@ -24,7 +24,6 @@ #include <linux/printk.h> #include <linux/string.h> #include <linux/stringify.h> -#include <asm/ptrace.h> #include <stdarg.h> #include <stdio.h> #include <linux/kernel.h>
Move this uncommon header out of the common header. Signed-off-by: Simon Glass <sjg at chromium.org> --- Changes in v3: None Changes in v2: None arch/arm/cpu/arm1136/mx35/timer.c | 1 + arch/arm/cpu/arm926ejs/mx25/timer.c | 1 + arch/arm/cpu/arm926ejs/mx27/timer.c | 1 + arch/arm/cpu/arm926ejs/spear/spl.c | 1 + arch/arm/cpu/arm926ejs/spear/timer.c | 1 + arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 1 + arch/arm/cpu/armv8/sec_firmware.c | 1 + arch/arm/lib/interrupts.c | 1 + arch/arm/lib/interrupts_64.c | 1 + arch/arm/mach-imx/sip.c | 1 + arch/arm/mach-meson/board-common.c | 1 + arch/arm/mach-meson/sm.c | 1 + arch/arm/mach-mvebu/arm64-common.c | 1 + arch/arm/mach-mvebu/armada8k/dram.c | 1 + arch/m68k/lib/interrupts.c | 1 + arch/m68k/lib/traps.c | 1 + arch/mips/lib/traps.c | 1 + arch/powerpc/cpu/mpc83xx/interrupts.c | 1 + arch/powerpc/cpu/mpc83xx/traps.c | 1 + arch/powerpc/cpu/mpc85xx/interrupts.c | 1 + arch/powerpc/cpu/mpc85xx/traps.c | 1 + arch/powerpc/cpu/mpc86xx/interrupts.c | 1 + arch/powerpc/cpu/mpc86xx/traps.c | 1 + arch/powerpc/cpu/mpc8xx/interrupts.c | 1 + arch/powerpc/cpu/mpc8xx/traps.c | 1 + arch/powerpc/lib/interrupts.c | 1 + arch/powerpc/lib/kgdb.c | 1 + arch/x86/cpu/i386/interrupt.c | 1 + arch/xtensa/cpu/exceptions.c | 1 + board/cavium/thunderx/atf.c | 1 + board/xilinx/zynqmp/zynqmp.c | 1 + cmd/bedbug.c | 1 + common/bedbug.c | 1 + common/kgdb.c | 1 + common/kgdb_stubs.c | 1 + drivers/clk/clk_versal.c | 1 + drivers/firmware/firmware-zynqmp.c | 1 + drivers/timer/mpc83xx_timer.c | 1 + include/common.h | 1 - 39 files changed, 38 insertions(+), 1 deletion(-)