]> git.baikalelectronics.ru Git - kernel.git/commitdiff
kbuild: mark prepare0 as PHONY to fix external module build
authorMasahiro Yamada <yamada.masahiro@socionext.com>
Tue, 15 Jan 2019 07:19:00 +0000 (16:19 +0900)
committerMasahiro Yamada <yamada.masahiro@socionext.com>
Thu, 17 Jan 2019 14:42:59 +0000 (23:42 +0900)
Commit a40f02c47b1a ("powerpc/32: add stack protector support")
caused kernel panic on PowerPC when an external module is used with
CONFIG_STACKPROTECTOR because the 'prepare' target was not executed
for the external module build.

Commit b7300bdf31ff ("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. GNU Make is fine with
missing rule for phony targets. I also removed the comment which is
wrong irrespective of this commit.

I minimize the change so it can be easily backported to 4.20.x

To fix v4.20, please backport b7300bdf31ff ("kbuild: fix single target
build for external module"), and then this commit.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=201891
Fixes: b7300bdf31ff ("kbuild: fix single target build for external module")
Fixes: a40f02c47b1a ("powerpc/32: add stack protector support")
Fixes: f71ca689b45f ("ARM: smp: add support for per-task stack canaries")
Fixes: 0145e94a834b ("arm64: enable per-task stack canaries")
Cc: linux-stable <stable@vger.kernel.org> # v4.20
Reported-by: Samuel Holland <samuel@sholland.org>
Reported-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Tested-by: Alexey Kardashevskiy <aik@ozlabs.ru>
Makefile

index ff1054cfca33a81f0f099bdff755f9fd51b4a0c4..a189ceadcd086a1c8525529966249035fdcf0c01 100644 (file)
--- 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: