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,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 1BB2DC33CAF for ; Thu, 16 Jan 2020 17:39:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DBD2424710 for ; Thu, 16 Jan 2020 17:39:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196356; bh=wn9NkdjBD/tnHYFoRSC6MY9E2KdcMrxWI4oxFXbsOfc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LFNoYMu1MuGO8u4YAO2TQkJVTLm5+7lUVdqKXfP11EqQrBS4vtpE/fF21D9PAIkpT hs3XV9xWmIzEXq13iCP3pG9aL8/7LhUtQX4/j1YJySt37VYbSX2Va8YpfudKl55qBh Il5dH50YdeJo3rzLap+/1Kl4BoJYLiR6taF2ZY3Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393449AbgAPRjP (ORCPT ); Thu, 16 Jan 2020 12:39:15 -0500 Received: from mail.kernel.org ([198.145.29.99]:54406 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393346AbgAPRi3 (ORCPT ); Thu, 16 Jan 2020 12:38:29 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (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 D054F24708; Thu, 16 Jan 2020 17:38:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196309; bh=wn9NkdjBD/tnHYFoRSC6MY9E2KdcMrxWI4oxFXbsOfc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HWu+l9+r9AMN2IZFkn1++0TB0Wdeq2kaRTTctD7V5zyblSoRkAbTFgmvluqtMVWAO udKpf/tRnK1mRLzTF2c84MsmfQm+eu/kviVqaVJmsDGM2fTWpCEKYN7sS7KIL6FT7/ ynO89GGwy52Wy9bGen6YVQOsi7Q9d2aUWFnKTKJE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ben Hutchings , Michael Ellerman , Sasha Levin , linuxppc-dev@lists.ozlabs.org Subject: [PATCH AUTOSEL 4.9 117/251] powerpc: vdso: Make vdso32 installation conditional in vdso_install Date: Thu, 16 Jan 2020 12:34:26 -0500 Message-Id: <20200116173641.22137-77-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-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: Ben Hutchings [ Upstream commit ff6d27823f619892ab96f7461764840e0d786b15 ] The 32-bit vDSO is not needed and not normally built for 64-bit little-endian configurations. However, the vdso_install target still builds and installs it. Add the same config condition as is normally used for the build. Fixes: e0d005916994 ("powerpc/vdso: Disable building the 32-bit VDSO ...") Signed-off-by: Ben Hutchings Signed-off-by: Michael Ellerman Signed-off-by: Sasha Levin --- arch/powerpc/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index a60c9c6e5cc1..de29b88c0e70 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -373,7 +373,9 @@ vdso_install: ifeq ($(CONFIG_PPC64),y) $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 $@ endif +ifdef CONFIG_VDSO32 $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso32 $@ +endif archclean: $(Q)$(MAKE) $(clean)=$(boot) -- 2.20.1