From patchwork Wed Oct 24 19:32:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 10654887 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1938D14E2 for ; Wed, 24 Oct 2018 19:33:29 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 09C6128AC0 for ; Wed, 24 Oct 2018 19:33:29 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F084128A34; Wed, 24 Oct 2018 19:33:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C84928A22 for ; Wed, 24 Oct 2018 19:33:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726800AbeJYECo (ORCPT ); Thu, 25 Oct 2018 00:02:44 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:33853 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726398AbeJYECl (ORCPT ); Thu, 25 Oct 2018 00:02:41 -0400 Received: by mail-pg1-f193.google.com with SMTP id g12-v6so2814576pgs.1; Wed, 24 Oct 2018 12:33:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=v8Yi7ueBJYSGPnl2J+y90jQpIuvIYmkZHV1ezCwJjgw=; b=X8qXYx98KGASUvBgWDX6YL5T5CXdOj9tEbpP9mF3RNRaqdyFJEAmLF/tiJ1T6tZp5P xo2FwK/+6fRXFOlSr3/5oKxJEbkMiAC/rPixr8RJVQHB0skYXcyYdKIm4Wy0uA1jyR0q 54jqHeFW1gM37iOa3thSYCISwEHX+Ywz/mKKq86R/QCkdfHLhJpOkIG/rzxNz62KXS8E MId8IvqDn7ul+QgH8eB9mc0rGiO++2J1ElANQqB6Gg5GIIo9e6zTMewMomAl5+9xK2ST fqPADGlW6WfjNzJ9dPp/PjKY5qi/3exxxoy6Vm0QdefqSYNoAwoT5FFFlbSPJM4jst6E a8Sw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=v8Yi7ueBJYSGPnl2J+y90jQpIuvIYmkZHV1ezCwJjgw=; b=oSsmSQUu3rvYJ4ERVxYeur27WmL8HlpTjuz0Ob7I2D2BvNjSCCG8s7o6IcuMqJZJ3F 3yIOu8HpKzmH0znJcCPA+W0VGZ17tLz+RC8txKfFMkMnClcNo2s/yAt8LSfKRh7w/q78 cZ81mIo9zL51ujOsik/yW/RGtm4ibkQlvnfG0AChLdtRmCBnvY0MpCZEgDRSIIxR99nc +lmK5ibV8bC21i1pzdwDYryLbeKDDBHKhIxSsOLsuR71iB3ja10k6wWvbLyHhrtXpBKW DnUIljlZ3ffx0UMlZvG5pvnvE/NP5SU5w2ZWI5g6H/ooew9I5zwf8xfNnL4hQFtv7h/l L0EA== X-Gm-Message-State: AGRZ1gJywaKkMFqY4M1kCRnR/MVU4d9haaQdkO+IueRPDWehq6yrJ4u3 agxDLZ7b90Bt+lyH7oOXYf6lMMHgO9w= X-Google-Smtp-Source: AJdET5e3oklkZJl6VLmc9P+CGQ6GZjw475mB8zXT96bhabntKvO9g5ltPujlD6PYuuoSOZoG7K1pwQ== X-Received: by 2002:a62:e80c:: with SMTP id c12-v6mr3920623pfi.124.1540409599360; Wed, 24 Oct 2018 12:33:19 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id j187-v6sm9818878pfc.39.2018.10.24.12.33.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Oct 2018 12:33:18 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Catalin Marinas , Will Deacon , Arnd Bergmann , Greg Kroah-Hartman , Marc Zyngier , Olof Johansson , linux-alpha@vger.kernel.org (open list:ALPHA PORT), linux-snps-arc@lists.infradead.org (open list:SYNOPSYS ARC ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated list:ARM PORT), linux-c6x-dev@linux-c6x.org (open list:C6X ARCHITECTURE), uclinux-h8-devel@lists.sourceforge.jp (moderated list:H8/300 ARCHITECTURE), linux-hexagon@vger.kernel.org (open list:QUALCOMM HEXAGON ARCHITECTURE), linux-ia64@vger.kernel.org (open list:IA64 (Itanium) PLATFORM), linux-m68k@lists.linux-m68k.org (open list:M68K ARCHITECTURE), linux-mips@linux-mips.org (open list:MIPS), nios2-dev@lists.rocketboards.org (moderated list:NIOS2 ARCHITECTURE), openrisc@lists.librecores.org (open list:OPENRISC ARCHITECTURE), linux-parisc@vger.kernel.org (open list:PARISC ARCHITECTURE), linuxppc-dev@lists.ozlabs.org (open list:LINUX FOR POWERPC (32-BIT AND 64-BIT)), linux-riscv@lists.infradead.org (open list:RISC-V ARCHITECTURE), linux-s390@vger.kernel.org (open list:S390), linux-sh@vger.kernel.org (open list:SUPERH), sparclinux@vger.kernel.org (open list:SPARC + UltraSPARC (sparc/sparc64)), linux-um@lists.infradead.org (open list:USER-MODE LINUX (UML)), linux-xtensa@linux-xtensa.org (open list:TENSILICA XTENSA PORT (xtensa)), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE), linux-arch@vger.kernel.org (open list:GENERIC INCLUDE/ASM HEADER FILES) Subject: [PATCH v2 1/2] arch: Add asm-generic/initrd.h and make use of it for most architectures Date: Wed, 24 Oct 2018 12:32:55 -0700 Message-Id: <20181024193256.23734-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181024193256.23734-1-f.fainelli@gmail.com> References: <20181024193256.23734-1-f.fainelli@gmail.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In preparation for separating the definition of __early_init_dt_declare_initrd() on ARM64 in order to cut the amount of files that require a rebuild when CONFIG_BLK_DEV_INITRD value is changed, introduce an empty asm-generic initrd.h file and update all architectures but arm64 to make use of it. Signed-off-by: Florian Fainelli --- arch/alpha/include/asm/Kbuild | 1 + arch/arc/include/asm/Kbuild | 1 + arch/arm/include/asm/Kbuild | 1 + arch/c6x/include/asm/Kbuild | 1 + arch/h8300/include/asm/Kbuild | 1 + arch/hexagon/include/asm/Kbuild | 1 + arch/ia64/include/asm/Kbuild | 1 + arch/m68k/include/asm/Kbuild | 1 + arch/microblaze/include/asm/Kbuild | 1 + arch/mips/include/asm/Kbuild | 1 + arch/nds32/include/asm/Kbuild | 1 + arch/nios2/include/asm/Kbuild | 1 + arch/openrisc/include/asm/Kbuild | 1 + arch/parisc/include/asm/Kbuild | 1 + arch/powerpc/include/asm/Kbuild | 1 + arch/riscv/include/asm/Kbuild | 1 + arch/s390/include/asm/Kbuild | 1 + arch/sh/include/asm/Kbuild | 1 + arch/sparc/include/asm/Kbuild | 1 + arch/um/include/asm/Kbuild | 1 + arch/unicore32/include/asm/Kbuild | 1 + arch/x86/include/asm/Kbuild | 1 + arch/xtensa/include/asm/Kbuild | 1 + include/asm-generic/initrd.h | 1 + 24 files changed, 24 insertions(+) create mode 100644 include/asm-generic/initrd.h diff --git a/arch/alpha/include/asm/Kbuild b/arch/alpha/include/asm/Kbuild index 0580cb8c84b2..cd6f723aed1b 100644 --- a/arch/alpha/include/asm/Kbuild +++ b/arch/alpha/include/asm/Kbuild @@ -5,6 +5,7 @@ generic-y += compat.h generic-y += exec.h generic-y += export.h generic-y += fb.h +generic-y += initrd.h generic-y += irq_work.h generic-y += mcs_spinlock.h generic-y += mm-arch-hooks.h diff --git a/arch/arc/include/asm/Kbuild b/arch/arc/include/asm/Kbuild index feed50ce89fa..ba18632aa493 100644 --- a/arch/arc/include/asm/Kbuild +++ b/arch/arc/include/asm/Kbuild @@ -10,6 +10,7 @@ generic-y += fb.h generic-y += ftrace.h generic-y += hardirq.h generic-y += hw_irq.h +generic-y += initrd.h generic-y += irq_regs.h generic-y += irq_work.h generic-y += kmap_types.h diff --git a/arch/arm/include/asm/Kbuild b/arch/arm/include/asm/Kbuild index 1d66db9c9db5..b91d5b32e64f 100644 --- a/arch/arm/include/asm/Kbuild +++ b/arch/arm/include/asm/Kbuild @@ -4,6 +4,7 @@ generic-y += early_ioremap.h generic-y += emergency-restart.h generic-y += exec.h generic-y += extable.h +generic-y += initrd.h generic-y += irq_regs.h generic-y += kdebug.h generic-y += local.h diff --git a/arch/c6x/include/asm/Kbuild b/arch/c6x/include/asm/Kbuild index 33a2c94fed0d..9e14cf6e89b4 100644 --- a/arch/c6x/include/asm/Kbuild +++ b/arch/c6x/include/asm/Kbuild @@ -13,6 +13,7 @@ generic-y += extable.h generic-y += fb.h generic-y += futex.h generic-y += hw_irq.h +generic-y += initrd.h generic-y += io.h generic-y += irq_regs.h generic-y += irq_work.h diff --git a/arch/h8300/include/asm/Kbuild b/arch/h8300/include/asm/Kbuild index a5d0b2991f47..7d4e06a757c8 100644 --- a/arch/h8300/include/asm/Kbuild +++ b/arch/h8300/include/asm/Kbuild @@ -19,6 +19,7 @@ generic-y += futex.h generic-y += hardirq.h generic-y += hash.h generic-y += hw_irq.h +generic-y += initrd.h generic-y += irq_regs.h generic-y += irq_work.h generic-y += kdebug.h diff --git a/arch/hexagon/include/asm/Kbuild b/arch/hexagon/include/asm/Kbuild index 47c4da3d64a4..0be62abf2123 100644 --- a/arch/hexagon/include/asm/Kbuild +++ b/arch/hexagon/include/asm/Kbuild @@ -13,6 +13,7 @@ generic-y += fb.h generic-y += ftrace.h generic-y += hardirq.h generic-y += hw_irq.h +generic-y += initrd.h generic-y += iomap.h generic-y += irq_regs.h generic-y += irq_work.h diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild index 557bbc8ba9f5..1a1f1e4ba0d5 100644 --- a/arch/ia64/include/asm/Kbuild +++ b/arch/ia64/include/asm/Kbuild @@ -1,5 +1,6 @@ generic-y += compat.h generic-y += exec.h +generic-y += initrd.h generic-y += irq_work.h generic-y += mcs_spinlock.h generic-y += mm-arch-hooks.h diff --git a/arch/m68k/include/asm/Kbuild b/arch/m68k/include/asm/Kbuild index a4b8d3331a9e..9903551e0c9c 100644 --- a/arch/m68k/include/asm/Kbuild +++ b/arch/m68k/include/asm/Kbuild @@ -7,6 +7,7 @@ generic-y += exec.h generic-y += extable.h generic-y += futex.h generic-y += hw_irq.h +generic-y += initrd.h generic-y += irq_regs.h generic-y += irq_work.h generic-y += kdebug.h diff --git a/arch/microblaze/include/asm/Kbuild b/arch/microblaze/include/asm/Kbuild index 569ba9e670c1..ec37e6304be5 100644 --- a/arch/microblaze/include/asm/Kbuild +++ b/arch/microblaze/include/asm/Kbuild @@ -11,6 +11,7 @@ generic-y += exec.h generic-y += extable.h generic-y += fb.h generic-y += hardirq.h +generic-y += initrd.h generic-y += irq_regs.h generic-y += irq_work.h generic-y += kdebug.h diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild index 9a81e72119da..005ef04a4c73 100644 --- a/arch/mips/include/asm/Kbuild +++ b/arch/mips/include/asm/Kbuild @@ -5,6 +5,7 @@ generic-y += device.h generic-y += dma-contiguous.h generic-y += emergency-restart.h generic-y += export.h +generic-y += initrd.h generic-y += irq_work.h generic-y += local64.h generic-y += mcs_spinlock.h diff --git a/arch/nds32/include/asm/Kbuild b/arch/nds32/include/asm/Kbuild index dbc4e5422550..1400aaf0c840 100644 --- a/arch/nds32/include/asm/Kbuild +++ b/arch/nds32/include/asm/Kbuild @@ -25,6 +25,7 @@ generic-y += ftrace.h generic-y += gpio.h generic-y += hardirq.h generic-y += hw_irq.h +generic-y += initrd.h generic-y += ioctl.h generic-y += ioctls.h generic-y += irq.h diff --git a/arch/nios2/include/asm/Kbuild b/arch/nios2/include/asm/Kbuild index 8fde4fa2c34f..d89de02549ee 100644 --- a/arch/nios2/include/asm/Kbuild +++ b/arch/nios2/include/asm/Kbuild @@ -18,6 +18,7 @@ generic-y += ftrace.h generic-y += futex.h generic-y += hardirq.h generic-y += hw_irq.h +generic-y += initrd.h generic-y += irq_regs.h generic-y += irq_work.h generic-y += kdebug.h diff --git a/arch/openrisc/include/asm/Kbuild b/arch/openrisc/include/asm/Kbuild index eb87cd8327c8..296fd55e8473 100644 --- a/arch/openrisc/include/asm/Kbuild +++ b/arch/openrisc/include/asm/Kbuild @@ -15,6 +15,7 @@ generic-y += fb.h generic-y += ftrace.h generic-y += hardirq.h generic-y += hw_irq.h +generic-y += initrd.h generic-y += irq.h generic-y += irq_regs.h generic-y += irq_work.h diff --git a/arch/parisc/include/asm/Kbuild b/arch/parisc/include/asm/Kbuild index 2013d639e735..1382d78a2477 100644 --- a/arch/parisc/include/asm/Kbuild +++ b/arch/parisc/include/asm/Kbuild @@ -5,6 +5,7 @@ generic-y += div64.h generic-y += emergency-restart.h generic-y += exec.h generic-y += hw_irq.h +generic-y += initrd.h generic-y += irq_regs.h generic-y += irq_work.h generic-y += kdebug.h diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild index 3196d227e351..e3ea67c30605 100644 --- a/arch/powerpc/include/asm/Kbuild +++ b/arch/powerpc/include/asm/Kbuild @@ -1,5 +1,6 @@ generic-y += div64.h generic-y += export.h +generic-y += initrd.h generic-y += irq_regs.h generic-y += irq_work.h generic-y += local64.h diff --git a/arch/riscv/include/asm/Kbuild b/arch/riscv/include/asm/Kbuild index efdbe311e936..0e67ed69c423 100644 --- a/arch/riscv/include/asm/Kbuild +++ b/arch/riscv/include/asm/Kbuild @@ -17,6 +17,7 @@ generic-y += futex.h generic-y += hardirq.h generic-y += hash.h generic-y += hw_irq.h +generic-y += initrd.h generic-y += ioctl.h generic-y += ioctls.h generic-y += ipcbuf.h diff --git a/arch/s390/include/asm/Kbuild b/arch/s390/include/asm/Kbuild index e3239772887a..dc618745d427 100644 --- a/arch/s390/include/asm/Kbuild +++ b/arch/s390/include/asm/Kbuild @@ -13,6 +13,7 @@ generic-y += div64.h generic-y += emergency-restart.h generic-y += export.h generic-y += fb.h +generic-y += initrd.h generic-y += irq_regs.h generic-y += irq_work.h generic-y += kmap_types.h diff --git a/arch/sh/include/asm/Kbuild b/arch/sh/include/asm/Kbuild index 6a5609a55965..c006a7cf3a43 100644 --- a/arch/sh/include/asm/Kbuild +++ b/arch/sh/include/asm/Kbuild @@ -5,6 +5,7 @@ generic-y += div64.h generic-y += dma-mapping.h generic-y += emergency-restart.h generic-y += exec.h +generic-y += initrd.h generic-y += irq_regs.h generic-y += irq_work.h generic-y += local.h diff --git a/arch/sparc/include/asm/Kbuild b/arch/sparc/include/asm/Kbuild index 410b263ef5c8..a5772c2a96c8 100644 --- a/arch/sparc/include/asm/Kbuild +++ b/arch/sparc/include/asm/Kbuild @@ -5,6 +5,7 @@ generic-y += div64.h generic-y += emergency-restart.h generic-y += exec.h generic-y += export.h +generic-y += initrd.h generic-y += irq_regs.h generic-y += irq_work.h generic-y += linkage.h diff --git a/arch/um/include/asm/Kbuild b/arch/um/include/asm/Kbuild index b10dde6cb793..032cfe1b530b 100644 --- a/arch/um/include/asm/Kbuild +++ b/arch/um/include/asm/Kbuild @@ -12,6 +12,7 @@ generic-y += ftrace.h generic-y += futex.h generic-y += hardirq.h generic-y += hw_irq.h +generic-y += initrd.h generic-y += io.h generic-y += irq_regs.h generic-y += irq_work.h diff --git a/arch/unicore32/include/asm/Kbuild b/arch/unicore32/include/asm/Kbuild index 1372553dc0a9..32e7dea45fcd 100644 --- a/arch/unicore32/include/asm/Kbuild +++ b/arch/unicore32/include/asm/Kbuild @@ -13,6 +13,7 @@ generic-y += ftrace.h generic-y += futex.h generic-y += hardirq.h generic-y += hw_irq.h +generic-y += initrd.h generic-y += irq_regs.h generic-y += irq_work.h generic-y += kdebug.h diff --git a/arch/x86/include/asm/Kbuild b/arch/x86/include/asm/Kbuild index a0ab9ab61c75..290bd1c3ee2d 100644 --- a/arch/x86/include/asm/Kbuild +++ b/arch/x86/include/asm/Kbuild @@ -9,5 +9,6 @@ generated-y += xen-hypercalls.h generic-y += dma-contiguous.h generic-y += early_ioremap.h generic-y += export.h +generic-y += initrd.h generic-y += mcs_spinlock.h generic-y += mm-arch-hooks.h diff --git a/arch/xtensa/include/asm/Kbuild b/arch/xtensa/include/asm/Kbuild index 82c756431b49..f2c363f2d22a 100644 --- a/arch/xtensa/include/asm/Kbuild +++ b/arch/xtensa/include/asm/Kbuild @@ -9,6 +9,7 @@ generic-y += exec.h generic-y += extable.h generic-y += fb.h generic-y += hardirq.h +generic-y += initrd.h generic-y += irq_regs.h generic-y += irq_work.h generic-y += kdebug.h diff --git a/include/asm-generic/initrd.h b/include/asm-generic/initrd.h new file mode 100644 index 000000000000..40a8c178f10d --- /dev/null +++ b/include/asm-generic/initrd.h @@ -0,0 +1 @@ +/* empty */ From patchwork Wed Oct 24 19:32:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 10654889 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AE7FB14E2 for ; Wed, 24 Oct 2018 19:33:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9CCFF289E5 for ; Wed, 24 Oct 2018 19:33:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F59D28A34; Wed, 24 Oct 2018 19:33:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 188C5289E5 for ; Wed, 24 Oct 2018 19:33:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727129AbeJYECu (ORCPT ); Thu, 25 Oct 2018 00:02:50 -0400 Received: from mail-pg1-f196.google.com ([209.85.215.196]:35799 "EHLO mail-pg1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726448AbeJYECn (ORCPT ); Thu, 25 Oct 2018 00:02:43 -0400 Received: by mail-pg1-f196.google.com with SMTP id 32-v6so2809245pgu.2; Wed, 24 Oct 2018 12:33:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=R7GnanBC/dUP1yUUX1JKpyThiE0iCRjX5YFPvjRZfCc=; b=XUVPRaDoxMaZ0lc+zIzwRmVi++6Px2u+8TgSt+ESHM01GRwvZtXwQDGr4zqDSMZfrw 8nq+I4eE4vaqFXIJDj0j7q+PI42qbkO9Lx9HT8x5RKjlanTfAVScBJLHwP7splrM/86g SwKMGcaiEl1CEBvNP0jbIDkfSLJKkemdtX42rsEnrMQENoVA80iYvrzrwMnfiQoxbZni JkfwfIdggNQDt4uFgzXJhfpmuyCYCHoxEVICC0TXx1+PvFtzmXL0tV4d+3IFqdBUfCN3 GqHTcCVh6xi6gCkOdgy0tizfHP5iGPbFk5siMBPV9ZhNeCLYFPKMA1XnN4fFTHSdfvvV A26w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=R7GnanBC/dUP1yUUX1JKpyThiE0iCRjX5YFPvjRZfCc=; b=hK0UguTfdY9QfVLUphhAYiqBaYyDs1BQywRXoBMPy1dZ8kaZkdEoIm8sqZJLUUTWoS h8HTfypSxE4jRuo6KQxLXXdtU7U1deIAZachZjkF1N8dLiGJoQrvNFCNNrJTkU7/wy2Q E/WyVYhUKj/bDZ73RnTqVVSO5NtD/LYS2hs3RfOxfaQmwqly143RRxvym3ns1AbRVlnV BE5LWq75n/oSXPj8q72U6Mz0eb/0f2MBaweeoO1eNN9TpZhc79+5K5lYOb1hZiBgEKpY 9WaIRI45kQnoTMc5hho+5CinU2l8FMP5mFL1KT96mKtHefE5UjSN6PClltB/4r7yoUIa l9ig== X-Gm-Message-State: AGRZ1gKKuqivUU4xrW0KYYR4hoYVn0h9wIH6wbysUEfHQ7JKqWv2won5 DMuFuReqgb5dpHX1KkR9aJgkja9yD7g= X-Google-Smtp-Source: AJdET5dg31dP21iFfiQOW43Rew2HT+LpqU+mmMjIz/9NCSpREeKfcx0lWewCTEg3MxMGJke0wlIAEA== X-Received: by 2002:a62:b87:: with SMTP id 7-v6mr3903770pfl.67.1540409601762; Wed, 24 Oct 2018 12:33:21 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id j187-v6sm9818878pfc.39.2018.10.24.12.33.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Oct 2018 12:33:20 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Catalin Marinas , Will Deacon , Arnd Bergmann , Greg Kroah-Hartman , Marc Zyngier , Olof Johansson , linux-alpha@vger.kernel.org (open list:ALPHA PORT), linux-snps-arc@lists.infradead.org (open list:SYNOPSYS ARC ARCHITECTURE), linux-arm-kernel@lists.infradead.org (moderated list:ARM PORT), linux-c6x-dev@linux-c6x.org (open list:C6X ARCHITECTURE), uclinux-h8-devel@lists.sourceforge.jp (moderated list:H8/300 ARCHITECTURE), linux-hexagon@vger.kernel.org (open list:QUALCOMM HEXAGON ARCHITECTURE), linux-ia64@vger.kernel.org (open list:IA64 (Itanium) PLATFORM), linux-m68k@lists.linux-m68k.org (open list:M68K ARCHITECTURE), linux-mips@linux-mips.org (open list:MIPS), nios2-dev@lists.rocketboards.org (moderated list:NIOS2 ARCHITECTURE), openrisc@lists.librecores.org (open list:OPENRISC ARCHITECTURE), linux-parisc@vger.kernel.org (open list:PARISC ARCHITECTURE), linuxppc-dev@lists.ozlabs.org (open list:LINUX FOR POWERPC (32-BIT AND 64-BIT)), linux-riscv@lists.infradead.org (open list:RISC-V ARCHITECTURE), linux-s390@vger.kernel.org (open list:S390), linux-sh@vger.kernel.org (open list:SUPERH), sparclinux@vger.kernel.org (open list:SPARC + UltraSPARC (sparc/sparc64)), linux-um@lists.infradead.org (open list:USER-MODE LINUX (UML)), linux-xtensa@linux-xtensa.org (open list:TENSILICA XTENSA PORT (xtensa)), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE), linux-arch@vger.kernel.org (open list:GENERIC INCLUDE/ASM HEADER FILES) Subject: [PATCH v2 2/2] arm64: Create asm/initrd.h Date: Wed, 24 Oct 2018 12:32:56 -0700 Message-Id: <20181024193256.23734-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181024193256.23734-1-f.fainelli@gmail.com> References: <20181024193256.23734-1-f.fainelli@gmail.com> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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"