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: 988769 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="S8VFqNv7"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="X8qXYx98"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42gLNr6jFkz9sCr for ; Thu, 25 Oct 2018 06:46:33 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=H66vV0RKoUgGi/me9s0h/i1/fR1Qhe1WeZTvt8/bDzM=; b=S8VFqNv7Q5JXBeR566ZctD6xeB U33zsnwlTxVpW1EDGWcpebiJMiX15gv8mrNPw6GX4SqD6MyNs5wYK982FnRBhPjb26ZoNRWU7VW5I W/9pA5GTa0Qad6Z87+Q1Y6MO+BP8HOJFGYRv384PzV9mEoqJDtIrOCCDQW5INwT3w18KsoqsTsrRL 2dqVj1/q/VXJfJyvLjUgUeX8KH0FyfMxzghpmZthWsybWHxTkwzmYr5SH/Z6LTP+L9mXCWaqqqpEO FjN4mp8QvqqdFHOquIo00fFKIihaMBqgfM1T0+iMxSerqft3dPKsiizHtSU1FbDA+mVzeMO2zeRwk T0zQoW3A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gFP6r-0005lI-Sc; Wed, 24 Oct 2018 19:46:29 +0000 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gFOuJ-0000Kz-AV; Wed, 24 Oct 2018 19:33:37 +0000 Received: by mail-pg1-x544.google.com with SMTP id 23-v6so2798159pgc.8; 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=YUcciZPnsOILOSWHTR5La1CbRfWn6O+ujm/8ATlompdytpJFrGG+WB8J3XmwF2M6fP +7LkvOxFqgz826g7zedOCvPFvv9ORIht9iayhm6X3nRIPn7YpwlYenA4WaLoeDxUTv17 biqm9oj7aDs111Tri7lZoBR1zTPKF9BC5+AmLNz11Eer4AOWSMhLmd/+vdBv3nXAh9VJ gibn0L73r47MRSj7PlZqSXoNf/JxgfgPeBbKExu82oXEqkasIsqVoNhifoUDzC2nl2oG LNHGIXgnDKaknyoLXE0NNBDoUhuyaNkaVTyB73qL2VkYUTnDeQeIKK9cLyf+hZOF9i/L TuBw== X-Gm-Message-State: AGRZ1gLCKQk87tqCKcAzhwvYok2SLL/IRwTKzRZBpB9LJblGVE4zIqxG gjDtJP6zJg2WcYsxhPvfyHg= 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181024_123331_367186_F0A6DA13 X-CRM114-Status: GOOD ( 13.69 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:544 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (f.fainelli[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-um@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "open list:MIPS" , "open list:IA64 Itanium PLATFORM" , "open list:SUPERH" , Catalin Marinas , Will Deacon , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE" , "open list:SPARC + UltraSPARC sparc/sparc64" , "open list:RISC-V ARCHITECTURE" , "open list:GENERIC INCLUDE/ASM HEADER FILES" , "open list:S390" , Florian Fainelli , "open list:C6X ARCHITECTURE" , "open list:QUALCOMM HEXAGON ARCHITECTURE" , "open list:SYNOPSYS ARC ARCHITECTURE" , "moderated list:H8/300 ARCHITECTURE" , "open list:TENSILICA XTENSA PORT xtensa" , Arnd Bergmann , Marc Zyngier , "open list:USER-MODE LINUX UML" , "open list:M68K ARCHITECTURE" , "open list:OPENRISC ARCHITECTURE" , "moderated list:ARM PORT" , "open list:PARISC ARCHITECTURE" , Greg Kroah-Hartman , "open list:ALPHA PORT" , Olof Johansson , "moderated list:NIOS2 ARCHITECTURE" , "open list:LINUX FOR POWERPC 32-BIT AND 64-BIT" MIME-Version: 1.0 Sender: "linux-um" Errors-To: linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org 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: 988764 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="YOSFT1wO"; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XUVPRaDo"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42gL8q2ggyz9sBZ for ; Thu, 25 Oct 2018 06:36:11 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=DhAzBYzMFF+WWG7iGCZi8yGZP6EvAPKZ5ysTsXzvu5U=; b=YOSFT1wO25cCU6dslUOiZW65me GfGhiFKNaR+Jr8vB0HTT5jIDYmUU+R0ogGFqzEKobA/CFiUnv20F5XiksXW7dEBB4Ue5fcmJLgY1z tWlfwgk8SAvPLP2yLn4cMVYang3PpoiY3byxbftZzsrjvjGeNr2Cg4yzrRwhRSlUWkioiyewFKUV9 Znjx/3DS0YF6QzfJ8LdIC4VjMBeBNylx+NYoZoBiz8uf0/kcgpZxSasTbHtK8KVa4DqJ3Nbh6MMaU V1kXYshyePvFTH7P94VYKoToh40JRrZXj4cbjAaKOSs/odNlB6pkcWYx4joQqLnpLb91l6egLSMZJ T9FM0oFw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gFOwh-0002fD-R8; Wed, 24 Oct 2018 19:36:00 +0000 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gFOuK-0000LC-PS; Wed, 24 Oct 2018 19:33:39 +0000 Received: by mail-pf1-x444.google.com with SMTP id f78-v6so2936697pfe.1; 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=dh1Kq3V0FE+KPLMavD7IMacPehLTvfpf6TXRl/YeavgmMEugQy9KA24onK83cQfYmq kiV9IZWLgAP2UQJnWZ2y9Arxh7N1GzXMdGhVlKotmwW09Ct8F6sX5H7VuCBKcLJMUO7z sp9DoxqfGtN8TK+L9SYozyS8KMutUPavFOV45qwBl6BB88U3L9BokuWjQj3OMyFiMApi 3741oAAYIpEukoBA6NdaWhUlM7iNsuL1JGbFd1kdNWyKCWJh7S03P+4a1Eniuc0+m44g ySOxOJHg7B15QfTxQ4U+wL+xw68KHwLAeyaf/WRBEctsp7OL5L8lLkWC88yQ0MF0dfi3 KTkA== X-Gm-Message-State: AGRZ1gJdpvtHt6CMOKR0jdLiLTRmaglKAW39NHBBBi8YqoiZNzBHOw6Y ZVx1VAM/DujV7s39XKqrA88= 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 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> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181024_123332_872552_5E5A1B42 X-CRM114-Status: GOOD ( 14.67 ) X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:444 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (f.fainelli[at]gmail.com) -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-um@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "open list:MIPS" , "open list:IA64 Itanium PLATFORM" , "open list:SUPERH" , Catalin Marinas , Will Deacon , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE" , "open list:SPARC + UltraSPARC sparc/sparc64" , "open list:RISC-V ARCHITECTURE" , "open list:GENERIC INCLUDE/ASM HEADER FILES" , "open list:S390" , Florian Fainelli , "open list:C6X ARCHITECTURE" , "open list:QUALCOMM HEXAGON ARCHITECTURE" , "open list:SYNOPSYS ARC ARCHITECTURE" , "moderated list:H8/300 ARCHITECTURE" , "open list:TENSILICA XTENSA PORT xtensa" , Arnd Bergmann , Marc Zyngier , "open list:USER-MODE LINUX UML" , "open list:M68K ARCHITECTURE" , "open list:OPENRISC ARCHITECTURE" , "moderated list:ARM PORT" , "open list:PARISC ARCHITECTURE" , Greg Kroah-Hartman , "open list:ALPHA PORT" , Olof Johansson , "moderated list:NIOS2 ARCHITECTURE" , "open list:LINUX FOR POWERPC 32-BIT AND 64-BIT" MIME-Version: 1.0 Sender: "linux-um" Errors-To: linux-um-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org 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"