From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: From: Florian Fainelli Subject: [PATCH 2/2] arm64: Create asm/initrd.h Date: Tue, 23 Oct 2018 16:40:43 -0700 Message-Id: <20181023234044.1138-3-f.fainelli@gmail.com> In-Reply-To: <20181023234044.1138-1-f.fainelli@gmail.com> References: <20181023234044.1138-1-f.fainelli@gmail.com> To: linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linux-arm-kernel@lists.infradead.org, Florian Fainelli , Richard Henderson , Ivan Kokshaysky , Matt Turner , Vineet Gupta , Russell King , Catalin Marinas , Will Deacon , Mark Salter , Aurelien Jacquiot , Yoshinori Sato , Richard Kuo , Tony Luck , Fenghua Yu , Geert Uytterhoeven , Michal Simek , Ralf Baechle , Paul Burton , James Hogan , Greentime Hu , Vincent Chen , Ley Foon Tan , Jonas Bonn , Stefan Kristiansson , Stafford Horne , "James E.J. Bottomley" , Helge Deller , Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman , Palmer Dabbelt , Albert Ou , Martin Schwidefsky , Heiko Carstens , Rich Felker , "David S. Miller" , Jeff Dike , Richard Weinberger , Guan Xuetao , Thomas Gleixner , Ingo Molnar , Borislav Petkov , "H. Peter Anvin" , "maintainer:X86 ARCHITECTURE 32-BIT AND 64-BIT" , Chris Zankel , Max Filippov , Rob Herring , Frank Rowand , Stephen Boyd , Greg Kroah-Hartman , Kate Stewart , Philippe Ombredanne , Andrew Morton , Andrey Ryabinin , Christoffer Dall , Andrey Konovalov , Masahiro Yamada , Marc Zyngier , Greg Ungerer , Matt Redfearn , Thomas Petazzoni , Jan Henrik Weinstock , Alan Kao , Deepa Dinamani , Olof Johansson , Hendrik Brueckner , Alexei Starovoitov , Daniel Borkmann , Jessica Yu , Ard Biesheuvel , "open list:ALPHA PORT" , "open list:SYNOPSYS ARC ARCHITECTURE" , "open list:C6X ARCHITECTURE" , "moderated list:H8/300 ARCHITECTURE" , "open list:QUALCOMM HEXAGON ARCHITECTURE" , "open list:IA64 Itanium PLATFORM" , "open list:M68K ARCHITECTURE" , "open list:MIPS" , "moderated list:NIOS2 ARCHITECTURE" , "open list:OPENRISC ARCHITECTURE" , "open list:PARISC ARCHITECTURE" , "open list:LINUX FOR POWERPC 32-BIT AND 64-BIT" , "open list:RISC-V ARCHITECTURE" , "open list:S390" , "open list:SUPERH" , "open list:SPARC + UltraSPARC sparc/sparc64" , "open list:USER-MODE LINUX UML" , "open list:TENSILICA XTENSA PORT xtensa" , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE" , "open list:GENERIC INCLUDE/ASM HEADER FILES" List-ID: ARM64 is the only architecture that requires a re-definition of __early_init_dt_declare_initrd(). Now that we added the infrastructure in asm-generic to provide an asm/initrd.h file, properly break up that definition from asm/memory.h and make use of that header in drivers/of/fdt.c where this is used. This significantly cuts the number of objects that need to be rebuilt on ARM64 due to the repercusions of including asm/memory.h in several places. Signed-off-by: Florian Fainelli --- arch/arm64/include/asm/initrd.h | 13 +++++++++++++ arch/arm64/include/asm/memory.h | 8 -------- drivers/of/fdt.c | 1 + 3 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 arch/arm64/include/asm/initrd.h diff --git a/arch/arm64/include/asm/initrd.h b/arch/arm64/include/asm/initrd.h new file mode 100644 index 000000000000..0c9572485810 --- /dev/null +++ b/arch/arm64/include/asm/initrd.h @@ -0,0 +1,13 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef __ASM_INITRD_H +#define __ASM_INITRD_H + +#ifdef CONFIG_BLK_DEV_INITRD +#define __early_init_dt_declare_initrd(__start, __end) \ + do { \ + initrd_start = (__start); \ + initrd_end = (__end); \ + } while (0) +#endif + +#endif /* __ASM_INITRD_H */ diff --git a/arch/arm64/include/asm/memory.h b/arch/arm64/include/asm/memory.h index b96442960aea..dc3ca21ba240 100644 --- a/arch/arm64/include/asm/memory.h +++ b/arch/arm64/include/asm/memory.h @@ -168,14 +168,6 @@ #define IOREMAP_MAX_ORDER (PMD_SHIFT) #endif -#ifdef CONFIG_BLK_DEV_INITRD -#define __early_init_dt_declare_initrd(__start, __end) \ - do { \ - initrd_start = (__start); \ - initrd_end = (__end); \ - } while (0) -#endif - #ifndef __ASSEMBLY__ #include diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 800ad252cf9c..4e4711af907b 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -28,6 +28,7 @@ #include /* for COMMAND_LINE_SIZE */ #include +#include #include "of_private.h" -- 2.17.1