From patchwork Fri Jan 24 09:28:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 232990 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable 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 3B925C2D0DB for ; Fri, 24 Jan 2020 11:17:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0303C214AF for ; Fri, 24 Jan 2020 11:17:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864633; bh=NaF2NkkJWRcCYb/VuF+pVkFHrFRZrQbSkbrNuMtp1vM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TSoJzWOyH66Lupw8vp9mM+dmAsM/mgRwq5sudPHftkdFhy9fLGoGOjj6gvbDK+Ajs nzs3/ZTYz1pXgGG4bTzios/WOywpUWdcnQvxgCBNyfGuHYrAdoFsmdFHcFd+2jbamT WW1uvH27wl1ttnOR1TPPE0+7eaj8Ktb3eNPjyuB4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388491AbgAXLRI (ORCPT ); Fri, 24 Jan 2020 06:17:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:54022 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733082AbgAXLRI (ORCPT ); Fri, 24 Jan 2020 06:17:08 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 34C762075D; Fri, 24 Jan 2020 11:17:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579864627; bh=NaF2NkkJWRcCYb/VuF+pVkFHrFRZrQbSkbrNuMtp1vM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ua8pnbhBlHuxeQhZztjiAWndyqRat2dtP+btf6thFAj0xcqDFqV9xirV4WZR6U7fw 2u1I5tUEumlioyNi4Q/NBHyrZiTPl4M5s8dikUCwpMYJYJTgL2BiZaRXUbNbukhAYC qFv3m8nKWnmsWiwf0E9tx+cT2O2SK/mi5uj2dWZU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ben Hutchings , Michael Ellerman , Sasha Levin Subject: [PATCH 4.19 319/639] powerpc: vdso: Make vdso32 installation conditional in vdso_install Date: Fri, 24 Jan 2020 10:28:09 +0100 Message-Id: <20200124093126.982818684@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 e43321f46a3be..8954108df4570 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -412,7 +412,9 @@ vdso_install: ifdef CONFIG_PPC64 $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso64 $@ endif +ifdef CONFIG_VDSO32 $(Q)$(MAKE) $(build)=arch/$(ARCH)/kernel/vdso32 $@ +endif archclean: $(Q)$(MAKE) $(clean)=$(boot)