From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9AB1AC43141 for ; Sat, 16 Nov 2019 16:08:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 73A5320874 for ; Sat, 16 Nov 2019 16:08:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573920495; bh=EXrFZR95aAwcDSeymXCCjFEvcW5PY/VBzSqJopYtqCs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=IUhLxLY8BO4IGlvu+kayGTYKXM+C9CPe9ycyS5gGV+CJ+mHEvaeilKntP4t0SZjXq L5MRNPQI82OXVgvHdezy0GM1LhyDBk6yzQkg0DHfB/7Egl2qvf/wG4sF5NxUnLPPXe Iv6EUpY/KMan0/KqG7b88Q3nPXu/tpYW+F00t7MI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728185AbfKPPuP (ORCPT ); Sat, 16 Nov 2019 10:50:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:58118 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729313AbfKPPuM (ORCPT ); Sat, 16 Nov 2019 10:50:12 -0500 Received: from sasha-vm.mshome.net (unknown [50.234.116.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0F8E121479; Sat, 16 Nov 2019 15:50:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573919411; bh=EXrFZR95aAwcDSeymXCCjFEvcW5PY/VBzSqJopYtqCs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lkkBuissade6iWIYJa6GRUX1S3Y7to6pbFuETQ7YL2thErTGKqfsBQIaS2h6VMs6D vA6WYS7O7d3dhztI6EUuCVJ0EkFZMhYbVCMrL+WIO2frwW+vCwGKXQFUBpdpIsb+tQ fOEPRcjD4DmvE9Zp57dM2K4JVX5vkXaKLQFfxOkg= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Victor Kamensky , Kevin Brodsky , Catalin Marinas , Sasha Levin Subject: [PATCH AUTOSEL 4.14 110/150] arm64: makefile fix build of .i file in external module case Date: Sat, 16 Nov 2019 10:46:48 -0500 Message-Id: <20191116154729.9573-110-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191116154729.9573-1-sashal@kernel.org> References: <20191116154729.9573-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Victor Kamensky [ Upstream commit 98356eb0ae499c63e78073ccedd9a5fc5c563288 ] After 'a66649dab350 arm64: fix vdso-offsets.h dependency' if one will try to build .i file in case of external kernel module, build fails complaining that prepare0 target is missing. This issue came up with SystemTap when it tries to build variety of .i files for its own generated kernel modules trying to figure given kernel features/capabilities. The issue is that prepare0 is defined in top level Makefile only if KBUILD_EXTMOD is not defined. .i file rule depends on prepare and in case KBUILD_EXTMOD defined top level Makefile contains empty rule for prepare. But after mentioned commit arch/arm64/Makefile would introduce dependency on prepare0 through its own prepare target. Fix it to put proper ifdef KBUILD_EXTMOD around code introduced by mentioned commit. It matches what top level Makefile does. Acked-by: Kevin Brodsky Signed-off-by: Victor Kamensky Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- arch/arm64/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/Makefile b/arch/arm64/Makefile index 0c5f70e6d5cfa..8c4bc5a2c61f4 100644 --- a/arch/arm64/Makefile +++ b/arch/arm64/Makefile @@ -149,6 +149,7 @@ archclean: $(Q)$(MAKE) $(clean)=$(boot) $(Q)$(MAKE) $(clean)=$(boot)/dts +ifeq ($(KBUILD_EXTMOD),) # We need to generate vdso-offsets.h before compiling certain files in kernel/. # In order to do that, we should use the archprepare target, but we can't since # asm-offsets.h is included in some files used to generate vdso-offsets.h, and @@ -158,6 +159,7 @@ archclean: prepare: vdso_prepare vdso_prepare: prepare0 $(Q)$(MAKE) $(build)=arch/arm64/kernel/vdso include/generated/vdso-offsets.h +endif define archhelp echo '* Image.gz - Compressed kernel image (arch/$(ARCH)/boot/Image.gz)' -- 2.20.1