From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BCC2C5A0E7; Tue, 23 Jan 2024 00:41:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705970464; cv=none; b=qlHuRcf2xHKlguL8cKuugGnwmvERusFFiMbky9BuTVAQzdQEO9mHhI4+V0nMdb98muYuA4JpUag4UPKUWdhb+N/MX1hRB/DXiyWaN/3VmiKjjXP1nq52sa2XBIb2mlppuPcX72oy2p7CEqT3VsqQPMx371QaiJfLEttMZz9n0Pc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705970464; c=relaxed/simple; bh=XyxWhuik/DbUhHr1it0+KzDgfNNsLZU7zRp4O4yegKc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oTKR9t4WZpzwETPiXiVmXvWvhneQEofcJ48BXarcwD3zuztzoasbNcvoK1qLaFUFQ3MrffGLPMx1RnQzsJ9iT5oK+JA2KKIv9Dq0cq0OANde2PgyBBFwhtpZt4cMOkNXwqm0T/j8J1RBkeHTHGxsTXbQgKH/MN96VghqSMeyKaI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=k/m3Pgxk; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="k/m3Pgxk" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8B9D4C433C7; Tue, 23 Jan 2024 00:41:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705970464; bh=XyxWhuik/DbUhHr1it0+KzDgfNNsLZU7zRp4O4yegKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k/m3PgxkqFjJsiJnrTWDSHk3L8ZtrqoTPZZSBhQxv3ol/MLdqoKZjNEXCwBNmbvoV bX0SuhTBIj0tyib3dgnfPB/6eYX/mcIaf39iDZR98MbMvJI2sUvg7Q41n3TxmWNTbl jDZfArMS5Y5AAFHfBBF+7/KBZihAMIz6RPosOxIs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Masahiro Yamada , Nicholas Piggin , Michael Ellerman , Sasha Levin Subject: [PATCH 6.1 005/417] powerpc: add crtsavres.o to always-y instead of extra-y Date: Mon, 22 Jan 2024 15:52:53 -0800 Message-ID: <20240122235751.666442864@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235751.480367507@linuxfoundation.org> References: <20240122235751.480367507@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Masahiro Yamada [ Upstream commit 1b1e38002648819c04773647d5242990e2824264 ] crtsavres.o is linked to modules. However, as explained in commit d0e628cd817f ("kbuild: doc: clarify the difference between extra-y and always-y"), 'make modules' does not build extra-y. For example, the following command fails: $ make ARCH=powerpc LLVM=1 KBUILD_MODPOST_WARN=1 mrproper ps3_defconfig modules [snip] LD [M] arch/powerpc/platforms/cell/spufs/spufs.ko ld.lld: error: cannot open arch/powerpc/lib/crtsavres.o: No such file or directory make[3]: *** [scripts/Makefile.modfinal:56: arch/powerpc/platforms/cell/spufs/spufs.ko] Error 1 make[2]: *** [Makefile:1844: modules] Error 2 make[1]: *** [/home/masahiro/workspace/linux-kbuild/Makefile:350: __build_one_by_one] Error 2 make: *** [Makefile:234: __sub-make] Error 2 Signed-off-by: Masahiro Yamada Fixes: baa25b571a16 ("powerpc/64: Do not link crtsavres.o in vmlinux") Reviewed-by: Nicholas Piggin Signed-off-by: Michael Ellerman Link: https://msgid.link/20231120232332.4100288-1-masahiroy@kernel.org Signed-off-by: Sasha Levin --- arch/powerpc/lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile index b705c89f3e21..9b394bab17eb 100644 --- a/arch/powerpc/lib/Makefile +++ b/arch/powerpc/lib/Makefile @@ -43,7 +43,7 @@ obj-$(CONFIG_FUNCTION_ERROR_INJECTION) += error-inject.o # so it is only needed for modules, and only for older linkers which # do not support --save-restore-funcs ifndef CONFIG_LD_IS_BFD -extra-$(CONFIG_PPC64) += crtsavres.o +always-$(CONFIG_PPC64) += crtsavres.o endif obj-$(CONFIG_PPC_BOOK3S_64) += copyuser_power7.o copypage_power7.o \ -- 2.43.0