From patchwork Mon Apr 8 07:54:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 10888933 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 21C3114DB for ; Mon, 8 Apr 2019 07:55:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 05A3C284AA for ; Mon, 8 Apr 2019 07:55:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ED6232851B; Mon, 8 Apr 2019 07:55:36 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 945C5284AA for ; Mon, 8 Apr 2019 07:55:36 +0000 (UTC) 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=WHhRGCDOQBStZbrYB3Hix9H+smnzJ8K4BZSncbKpgIE=; b=HpcNJ+0hExHTTeYLS+CEDEU4ju u2YGY/PKS0lZWq5TS6lW209D43R/EPchra/jJRScutio3IKxtg7H99NZfHSIj9MBHCfrMQqQ8Twie 9xasgOTiS5ySArX5l7axulv5PN2xcOJlMo325vD/R+5JphEdT8KJhi2xpH2eITSkgWFD52TVJ7PPR VMD4YKyGrME90VIisSuHPivR0rHws4zbIu1FM7FyLJXMFbteW+w9x7REQ3zZ2KndcgjXOpZ2MAWrU FlWPLrebVKUjJo3VVdadotkW2qT7P1vPT0/w8id7mnEthevjtu+VhLyR1+NziwptN7Z0N6Deqf3P6 vXBhBLDw==; 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 1hDP7q-0002On-8i; Mon, 08 Apr 2019 07:55:30 +0000 Received: from conuserg-09.nifty.com ([210.131.2.76]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hDP7T-0001Lt-PE for linux-arm-kernel@lists.infradead.org; Mon, 08 Apr 2019 07:55:11 +0000 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id x387sSop029620; Mon, 8 Apr 2019 16:54:29 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x387sSop029620 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1554710070; bh=J+Os6G/U5M9lW5V8kWbPPhrXmHnKe19y0jvJ6jloN00=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rT06vdNyrdn7znL3cXw6x0XFCnUgkyNZWQ06k0sstLrLVDWWL3BGFb3r/MpMpO/z2 VUer1uE0G1UwVanCyjainepmkd0jA3VGVx6NDjVmO2965ywWxxnS+N+t+VkHMF59nx PK5c5hlcnIzqHIosyP+utGyf21hJe769h6OGI4g/Nw6J2fQUzEajiDPuT4ksGSp63Q uoeAIOXi/mlsnbe6at4sMAGjE4sK+CvWJGuYk8HHUhh0fMWfMVs74YgFptwOUuVLg5 MQb8d23o27qtGmIFc+t3aLC2DaMHIH92uOAHCErNx9RBBNwwYUawsJbS7qtAQGFUn8 BupfC2daeXg+w== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: arm@kernel.org, Olof Johansson , Arnd Bergmann Subject: [PATCH 2/3] ARM: at91: move platform-specific asm-offset.h to arch/arm/mach-at91 Date: Mon, 8 Apr 2019 16:54:26 +0900 Message-Id: <20190408075427.6052-2-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190408075427.6052-1-yamada.masahiro@socionext.com> References: <20190408075427.6052-1-yamada.masahiro@socionext.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190408_005508_241595_8870293C X-CRM114-Status: GOOD ( 13.07 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alexandre Belloni , linux-kernel@vger.kernel.org, Masahiro Yamada , Ludovic Desroches , Russell King , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP is only generated and included by arch/arm/mach-at91/, so it does not need to reside in the globally visible include/generated/. I moved and renamed it to arch/arm/mach-at91/pm_data-offsets.h since the prefix 'at91_' is just redundant in mach-at91/. Signed-off-by: Masahiro Yamada Acked-by: Alexandre Belloni --- Can this be applied to ARM-SOC tree in a series? (with Ack from the platform sub-maintainer.) at91_pm_data-offsets.h header does not need to reside in include/generated/, but you may ask "Why must it get out of include/generated/?" My main motivation is to avoid a race condition in the currently proposed patch: https://lore.kernel.org/patchwork/patch/1052763/ This patch tries to embed some build artifacts into the kernel. If arch/arm/mach-at91/ and kernel/ are built at the same time, it may embed a truncated file. arch/arm/mach-at91/.gitignore | 1 + arch/arm/mach-at91/Makefile | 5 +++-- arch/arm/mach-at91/pm_suspend.S | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 arch/arm/mach-at91/.gitignore diff --git a/arch/arm/mach-at91/.gitignore b/arch/arm/mach-at91/.gitignore new file mode 100644 index 000000000000..2ecd6f51c8a9 --- /dev/null +++ b/arch/arm/mach-at91/.gitignore @@ -0,0 +1 @@ +pm_data-offsets.h diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile index 31b61f0e1c07..de64301dcff2 100644 --- a/arch/arm/mach-at91/Makefile +++ b/arch/arm/mach-at91/Makefile @@ -19,9 +19,10 @@ ifeq ($(CONFIG_PM_DEBUG),y) CFLAGS_pm.o += -DDEBUG endif -include/generated/at91_pm_data-offsets.h: arch/arm/mach-at91/pm_data-offsets.s FORCE +$(obj)/pm_data-offsets.h: $(obj)/pm_data-offsets.s FORCE $(call filechk,offsets,__PM_DATA_OFFSETS_H__) -arch/arm/mach-at91/pm_suspend.o: include/generated/at91_pm_data-offsets.h +$(obj)/pm_suspend.o: $(obj)/pm_data-offsets.h targets += pm_data-offsets.s +clean-files += pm_data-offsets.h diff --git a/arch/arm/mach-at91/pm_suspend.S b/arch/arm/mach-at91/pm_suspend.S index bfe1c4d06901..a31c1b20f3fa 100644 --- a/arch/arm/mach-at91/pm_suspend.S +++ b/arch/arm/mach-at91/pm_suspend.S @@ -14,7 +14,7 @@ #include #include #include "pm.h" -#include "generated/at91_pm_data-offsets.h" +#include "pm_data-offsets.h" #define SRAMC_SELF_FRESH_ACTIVE 0x01 #define SRAMC_SELF_FRESH_EXIT 0x00