From patchwork Fri Aug 23 02:43:45 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 172083 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp26915ily; Thu, 22 Aug 2019 19:45:22 -0700 (PDT) X-Google-Smtp-Source: APXvYqyCSYfgThqFvS9+InRhmwT0eY+9/+Rk5V7tHsL9RCXvu6Gsd8EGpSI1jwHYypF8i/CJQY/E X-Received: by 2002:aa7:93cf:: with SMTP id y15mr2526451pff.251.1566528322330; Thu, 22 Aug 2019 19:45:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1566528322; cv=none; d=google.com; s=arc-20160816; b=M+EzgEAWzLT4JKrfkjphq9TYlFzo7uT7a20lxiz5cQDJXG2/IJGhEOoMCmnMG0CIX8 K60vsiel7v9Cb0luDr/vwhcmor+TzdVkaiZMiQsUV5QCEZP+Cv/TMU0YUgF9e6n5eDLJ cTVje0QJKcHyWqe1KhptRmQtYuW/6lQsWbUa/KmgVlbqEijkx1PWVn0spbdzk9VA6ZmF n2xCWvKEJsR2s2/7bvx3MPGSBvAnb/hVXADP7VapxRIXzRFhRR6dlLaNUIpXA+hfKfyw /9LMbbGLyq1UzIL20PoWI+h2se8/6QOX8uB8tzULK5lvPCU7+w4x4qBhhO476ngFkJUh v+Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter; bh=RUQPvpeRirVgphhnQn/uX9bo3iR6wYuDL45CJSJJoug=; b=u1LQKVbpViFvj94FBJ8YfAS3qOC9w0zOAsGNz3n/hsFKe3T23OpAx+Vy0U41lgeL7A t4D4IG+ShE/l0cqtJSxAd15ahTplc5eiBwcaEzNSjd3yMY6Q0MWr6CsW+KRY+0uKd4iB SvTr8En+L7UQcWxyrjaDoORuMVfrMC+j/RDjmQdWindMAmw6qdv0plDA6ygW3cWnsKnQ lEIBr5qs37Rd/GWo0lSu9ddICQcXGnUkpw8/Iy4UJPgfX/sUPcZ0Ke5OXxVLwaJsAM87 0ulCynx3+cOUIjoObXFXUWMrXDNle1Oz3XwQ3fhYjwg5E1vLJXHMPU5LdrmgIzV47teh yK2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=nCKjhe3p; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v8si1143100plp.96.2019.08.22.19.45.22; Thu, 22 Aug 2019 19:45:22 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=nCKjhe3p; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403775AbfHWCpV (ORCPT + 28 others); Thu, 22 Aug 2019 22:45:21 -0400 Received: from conuserg-10.nifty.com ([210.131.2.77]:29997 "EHLO conuserg-10.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391306AbfHWCpU (ORCPT ); Thu, 22 Aug 2019 22:45:20 -0400 Received: from localhost.localdomain (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-10.nifty.com with ESMTP id x7N2i1YP015237; Fri, 23 Aug 2019 11:44:02 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-10.nifty.com x7N2i1YP015237 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1566528242; bh=RUQPvpeRirVgphhnQn/uX9bo3iR6wYuDL45CJSJJoug=; h=From:To:Cc:Subject:Date:From; b=nCKjhe3pKvSY21V/fQedzyEyJxixda6YkE/vIjR4gckiMxCR2Ri/HX7RmIyvBf2g5 v+Wra+fyG/KES1p4LdTXY1GCqaUzcx3GDGAew8hVzH9tFfn6ekLFOGsjoMsjvR4ZAd 7PjQ87z7iPsp/nnw94Izt8Z6bLGqTLHPcM1skMTCL5Hx2MGVE4836eraFocvVpkAP7 Z1xj1Xf79DzUqiKvuODHuFbcY+NiUDSlq3/BiUUyIP9+GrNEvOafjDz45WBhUwXMwx TMM8RVgyCN6UIayVxau8Xk4Av/H/5+0PoiBrZSrbHbRBLDqNpqqBbrpGov0qVxFvrO /NQcwzyECOxGw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Nicolas Ferre , Alexandre Belloni , Ludovic Desroches , linux-arm-kernel@lists.infradead.org Cc: Masahiro Yamada , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH] ARM: at91: move platform-specific asm-offset.h to arch/arm/mach-at91 Date: Fri, 23 Aug 2019 11:43:45 +0900 Message-Id: <20190823024346.591-1-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org is only generated and included by arch/arm/mach-at91/, so it does not need to reside in the globally visible include/generated/. I renamed it to arch/arm/mach-at91/pm_data-offsets.h since the prefix 'at91_' is just redundant in mach-at91/. My main motivation of this change is to avoid the race condition for the parallel build (-j) when CONFIG_IKHEADERS is enabled. When it is enabled, all the headers under include/ are archived into kernel/kheaders_data.tar.xz and exposed in the sysfs. In the parallel build, we have no idea in which order files are built. - If at91_pm_data-offsets.h is built before kheaders_data.tar.xz, the header will be included in the archive. Probably nobody will use it, but it is harmless except that it will increase the archive size needlessly. - If kheaders_data.tar.xz is built before at91_pm_data-offsets.h, the header will not be included in the archive. However, in the next build, the archive will be re-generated to include the newly-found at91_pm_data-offsets.h. This is not nice from the build system point of view. - If at91_pm_data-offsets.h and kheaders_data.tar.xz are built at the same time, the corrupted header might be included in the archive, which does not look nice either. This commit fixes the race. Signed-off-by: Masahiro Yamada --- 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 -- 2.17.1 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 c751f047b116..ed57c879d4e1 100644 --- a/arch/arm/mach-at91/pm_suspend.S +++ b/arch/arm/mach-at91/pm_suspend.S @@ -10,7 +10,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