Every architecture supported by the kernel has a functionally identical copy of <asm/asm-offsets.h> which simply includes <generated/asm-offsets.h>, even though it is also present in asm-generic. Eliminate this unnecessary complexity by adding <asm/asm-offsets.h> to the list of mandatory asm headers, which causes a copy of it that includes <asm-generic/asm-offsets.h> to be generated automatically.
Signed-off-by: Ethan Nelson-Moore <[email protected]> --- arch/arc/include/asm/asm-offsets.h | 6 ------ arch/arm/include/asm/asm-offsets.h | 1 - arch/arm64/include/asm/asm-offsets.h | 1 - arch/hexagon/include/asm/asm-offsets.h | 1 - arch/loongarch/include/asm/asm-offsets.h | 5 ----- arch/m68k/include/asm/asm-offsets.h | 1 - arch/microblaze/include/asm/asm-offsets.h | 1 - arch/mips/include/asm/asm-offsets.h | 1 - arch/nios2/include/asm/asm-offsets.h | 7 ------- arch/openrisc/include/asm/asm-offsets.h | 1 - arch/parisc/include/asm/asm-offsets.h | 1 - arch/powerpc/include/asm/asm-offsets.h | 1 - arch/riscv/include/asm/asm-offsets.h | 1 - arch/sh/include/asm/asm-offsets.h | 2 -- arch/sparc/include/asm/asm-offsets.h | 1 - arch/x86/include/asm/asm-offsets.h | 1 - arch/xtensa/include/asm/asm-offsets.h | 1 - include/asm-generic/Kbuild | 1 + 18 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 arch/arc/include/asm/asm-offsets.h delete mode 100644 arch/arm/include/asm/asm-offsets.h delete mode 100644 arch/arm64/include/asm/asm-offsets.h delete mode 100644 arch/hexagon/include/asm/asm-offsets.h delete mode 100644 arch/loongarch/include/asm/asm-offsets.h delete mode 100644 arch/m68k/include/asm/asm-offsets.h delete mode 100644 arch/microblaze/include/asm/asm-offsets.h delete mode 100644 arch/mips/include/asm/asm-offsets.h delete mode 100644 arch/nios2/include/asm/asm-offsets.h delete mode 100644 arch/openrisc/include/asm/asm-offsets.h delete mode 100644 arch/parisc/include/asm/asm-offsets.h delete mode 100644 arch/powerpc/include/asm/asm-offsets.h delete mode 100644 arch/riscv/include/asm/asm-offsets.h delete mode 100644 arch/sh/include/asm/asm-offsets.h delete mode 100644 arch/sparc/include/asm/asm-offsets.h delete mode 100644 arch/x86/include/asm/asm-offsets.h delete mode 100644 arch/xtensa/include/asm/asm-offsets.h diff --git a/arch/arc/include/asm/asm-offsets.h b/arch/arc/include/asm/asm-offsets.h deleted file mode 100644 index 32a1d3d518dc..000000000000 --- a/arch/arc/include/asm/asm-offsets.h +++ /dev/null @@ -1,6 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright (C) 2004, 2007-2010, 2011-2012 Synopsys, Inc. (www.synopsys.com) - */ - -#include <generated/asm-offsets.h> diff --git a/arch/arm/include/asm/asm-offsets.h b/arch/arm/include/asm/asm-offsets.h deleted file mode 100644 index d370ee36a182..000000000000 --- a/arch/arm/include/asm/asm-offsets.h +++ /dev/null @@ -1 +0,0 @@ -#include <generated/asm-offsets.h> diff --git a/arch/arm64/include/asm/asm-offsets.h b/arch/arm64/include/asm/asm-offsets.h deleted file mode 100644 index d370ee36a182..000000000000 --- a/arch/arm64/include/asm/asm-offsets.h +++ /dev/null @@ -1 +0,0 @@ -#include <generated/asm-offsets.h> diff --git a/arch/hexagon/include/asm/asm-offsets.h b/arch/hexagon/include/asm/asm-offsets.h deleted file mode 100644 index d370ee36a182..000000000000 --- a/arch/hexagon/include/asm/asm-offsets.h +++ /dev/null @@ -1 +0,0 @@ -#include <generated/asm-offsets.h> diff --git a/arch/loongarch/include/asm/asm-offsets.h b/arch/loongarch/include/asm/asm-offsets.h deleted file mode 100644 index d9ad88d293e7..000000000000 --- a/arch/loongarch/include/asm/asm-offsets.h +++ /dev/null @@ -1,5 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * Copyright (C) 2020-2022 Loongson Technology Corporation Limited - */ -#include <generated/asm-offsets.h> diff --git a/arch/m68k/include/asm/asm-offsets.h b/arch/m68k/include/asm/asm-offsets.h deleted file mode 100644 index d370ee36a182..000000000000 --- a/arch/m68k/include/asm/asm-offsets.h +++ /dev/null @@ -1 +0,0 @@ -#include <generated/asm-offsets.h> diff --git a/arch/microblaze/include/asm/asm-offsets.h b/arch/microblaze/include/asm/asm-offsets.h deleted file mode 100644 index d370ee36a182..000000000000 --- a/arch/microblaze/include/asm/asm-offsets.h +++ /dev/null @@ -1 +0,0 @@ -#include <generated/asm-offsets.h> diff --git a/arch/mips/include/asm/asm-offsets.h b/arch/mips/include/asm/asm-offsets.h deleted file mode 100644 index d370ee36a182..000000000000 --- a/arch/mips/include/asm/asm-offsets.h +++ /dev/null @@ -1 +0,0 @@ -#include <generated/asm-offsets.h> diff --git a/arch/nios2/include/asm/asm-offsets.h b/arch/nios2/include/asm/asm-offsets.h deleted file mode 100644 index e51465213b53..000000000000 --- a/arch/nios2/include/asm/asm-offsets.h +++ /dev/null @@ -1,7 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * Copyright (C) 2010 Tobias Klauser <[email protected]> - * Copyright (C) 2009 Thomas Chou <[email protected]> - */ - -#include <generated/asm-offsets.h> diff --git a/arch/openrisc/include/asm/asm-offsets.h b/arch/openrisc/include/asm/asm-offsets.h deleted file mode 100644 index d370ee36a182..000000000000 --- a/arch/openrisc/include/asm/asm-offsets.h +++ /dev/null @@ -1 +0,0 @@ -#include <generated/asm-offsets.h> diff --git a/arch/parisc/include/asm/asm-offsets.h b/arch/parisc/include/asm/asm-offsets.h deleted file mode 100644 index d370ee36a182..000000000000 --- a/arch/parisc/include/asm/asm-offsets.h +++ /dev/null @@ -1 +0,0 @@ -#include <generated/asm-offsets.h> diff --git a/arch/powerpc/include/asm/asm-offsets.h b/arch/powerpc/include/asm/asm-offsets.h deleted file mode 100644 index d370ee36a182..000000000000 --- a/arch/powerpc/include/asm/asm-offsets.h +++ /dev/null @@ -1 +0,0 @@ -#include <generated/asm-offsets.h> diff --git a/arch/riscv/include/asm/asm-offsets.h b/arch/riscv/include/asm/asm-offsets.h deleted file mode 100644 index d370ee36a182..000000000000 --- a/arch/riscv/include/asm/asm-offsets.h +++ /dev/null @@ -1 +0,0 @@ -#include <generated/asm-offsets.h> diff --git a/arch/sh/include/asm/asm-offsets.h b/arch/sh/include/asm/asm-offsets.h deleted file mode 100644 index 9f8535716392..000000000000 --- a/arch/sh/include/asm/asm-offsets.h +++ /dev/null @@ -1,2 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#include <generated/asm-offsets.h> diff --git a/arch/sparc/include/asm/asm-offsets.h b/arch/sparc/include/asm/asm-offsets.h deleted file mode 100644 index d370ee36a182..000000000000 --- a/arch/sparc/include/asm/asm-offsets.h +++ /dev/null @@ -1 +0,0 @@ -#include <generated/asm-offsets.h> diff --git a/arch/x86/include/asm/asm-offsets.h b/arch/x86/include/asm/asm-offsets.h deleted file mode 100644 index d370ee36a182..000000000000 --- a/arch/x86/include/asm/asm-offsets.h +++ /dev/null @@ -1 +0,0 @@ -#include <generated/asm-offsets.h> diff --git a/arch/xtensa/include/asm/asm-offsets.h b/arch/xtensa/include/asm/asm-offsets.h deleted file mode 100644 index d370ee36a182..000000000000 --- a/arch/xtensa/include/asm/asm-offsets.h +++ /dev/null @@ -1 +0,0 @@ -#include <generated/asm-offsets.h> diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild index 2c53a1e0b760..9879bba63a38 100644 --- a/include/asm-generic/Kbuild +++ b/include/asm-generic/Kbuild @@ -6,6 +6,7 @@ mandatory-y += atomic.h mandatory-y += archrandom.h +mandatory-y += asm-offsets.h mandatory-y += barrier.h mandatory-y += bitops.h mandatory-y += bug.h -- 2.43.0
