From patchwork Tue Jan 15 07:19:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 155632 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4565165jaa; Mon, 14 Jan 2019 23:21:09 -0800 (PST) X-Google-Smtp-Source: ALg8bN6J3q7XgPAmgwJ63vXYFn4QiykJ+r7WTNkPaPxpxIGXePI9CU6F7BUhpUod+ufRAVttjY7P X-Received: by 2002:a17:902:9a02:: with SMTP id v2mr2712144plp.180.1547536869876; Mon, 14 Jan 2019 23:21:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547536869; cv=none; d=google.com; s=arc-20160816; b=ya2SIar3JDblG+T211Tl49zhyCMb82FGLzKOBYXraGCqvWh+AUprK7WV8FiPxjx5AH RY7pYOkE08rdYrNtrBRm2JxvnR1khLDwzqgJF7Q7pYRKbA7ebkwiXagQVmzhF/QzzEXS PnWS864yS3XpqUcv6UeY8c/9eFFs/zI00QBQvzbn9IqOI1k+xE7M3UuOqlkwpLYUsMdw 6mCTIi77DQvj5+V0C5foKFKeI2zfmM1S9cUKs2s6KiGvKdc6ziyvgX14X3A/6OfMVX1N 25Z794iPAluIxRo38GndongFqH/sSRAXWPCCfj9lLZ/bqD1fKE0N+ZPVR8Igw9C2k5Ku XOXw== 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=08AbJJ8hBVDBXX2UF9mFjcRwzLGQ7QhyPVH8V6BPlIc=; b=U5PovFJgeUvsNefDgAxsCg8b176hLgCBLatxvkTbSwgLKRXD67/S/DQe4VMhslLP2z R0MxSUcasbSowVPTQzUz+DZN9m83yJgmfNiQP8z8Qs7X+uTW2oBNrqYw9YgpKkQcjWkH 1Cr0p3I4fiequYadQhxgwAWdxnnwHwKXs6A8hVrEHz4PiyF9PVKOhDalI+079Iiyk3eq AkFwJHD58I9xeFfI2nRRmBq21mFldyCZ3F91eF8Y+2hDgPyy4O+BFVP2nfzKQ+5p6Sln YoyOYyA7XzBOWZuRUUErNGk4KEnb23h+9QBM3wChgJuJCxvXG0FRc8g6YBIfHulWcrpz Z2eA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b="cc/+VoBv"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 g10si2804674plm.1.2019.01.14.23.21.08; Mon, 14 Jan 2019 23:21:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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="cc/+VoBv"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727439AbfAOHVH (ORCPT + 15 others); Tue, 15 Jan 2019 02:21:07 -0500 Received: from conuserg-09.nifty.com ([210.131.2.76]:46279 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726055AbfAOHVH (ORCPT ); Tue, 15 Jan 2019 02:21:07 -0500 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id x0F7JTTt025896; Tue, 15 Jan 2019 16:19:29 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com x0F7JTTt025896 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1547536770; bh=08AbJJ8hBVDBXX2UF9mFjcRwzLGQ7QhyPVH8V6BPlIc=; h=From:To:Cc:Subject:Date:From; b=cc/+VoBvxW4OZPcv2ix8I5JuxXptMd/3lF5mNIh5YELemVL1guzdqCSdqtZ1o8t9/ bi56yFu2Q+LvL4cacgvMAfVg6bFOseR4SJ9XDvvBb/Uynov0dsdYpZueuMekdaKJMK VE2zw6LIg/Rn1xzkzIhTAZCmRi42bi2NiOPEfDo9HkI+xI23PgEEWhE+nbVwU3fdbO jg3bnzwB25WmVBN5NVJQcb4yxrnl8TDXDlXEGPRrV2QZ5Y+AnGzOOPJMSFqUN/QDgr PTgg3eRb6Og435J+KADBC8w+QfjAS1U7EuAmPjMpJib1PA4t3YMT4JI8IVMcggQr6C dahgHqucL4exg== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ard Biesheuvel , Samuel Holland , Alexey Kardashevskiy , linuxppc-dev@lists.ozlabs.org, Michael Ellerman , Masahiro Yamada , "linux-stable # v4 . 20" , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH] kbuild: mark prepare0 as PHONY to fix external module build Date: Tue, 15 Jan 2019 16:19:00 +0900 Message-Id: <1547536740-1572-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Commit c3ff2a5193fa ("powerpc/32: add stack protector support") caused kernel panic on PowerPC if an external module is used with CONFIG_STACKPROTECTOR because the 'prepare' target was not executed for the external module build. Commit e07db28eea38 ("kbuild: fix single target build for external module") turned it into a build error because the 'prepare' target is now executed but the 'prepare0' target is missing for the external module build. External module on arm/arm64 with CONFIG_STACKPROTECTOR_PER_TASK is also broken in the same way. Move 'PHONY += prepare0' to the common place. Make is fine with missing rule for phony targets. I minimize the change so it can be easily backported to 4.20.x To fix v4.20 for external modules of PowerPC, please backport e07db28eea38 ("kbuild: fix single target build for external module"), and then this commit. Link: https://bugzilla.kernel.org/show_bug.cgi?id=201891 Fixes: e07db28eea38 ("kbuild: fix single target build for external module") Fixes: c3ff2a5193fa ("powerpc/32: add stack protector support") Fixes: 189af4657186 ("ARM: smp: add support for per-task stack canaries") Fixes: 0a1213fa7432 ("arm64: enable per-task stack canaries") Cc: linux-stable # v4.20 Reported-by: Samuel Holland Reported-by: Alexey Kardashevskiy Signed-off-by: Masahiro Yamada --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.4 diff --git a/Makefile b/Makefile index 499b968..789b332 100644 --- a/Makefile +++ b/Makefile @@ -955,6 +955,7 @@ ifdef CONFIG_STACK_VALIDATION endif endif +PHONY += prepare0 ifeq ($(KBUILD_EXTMOD),) core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/ @@ -1061,8 +1062,7 @@ scripts: scripts_basic scripts_dtc # archprepare is used in arch Makefiles and when processed asm symlink, # version.h and scripts_basic is processed / created. -# Listed in dependency order -PHONY += prepare archprepare prepare0 prepare1 prepare2 prepare3 +PHONY += prepare archprepare prepare1 prepare2 prepare3 # prepare3 is used to check if we are building in a separate output directory, # and if so do: