From nobody Wed Dec 17 23:07:02 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3DE31C61D98 for ; Tue, 21 Nov 2023 23:57:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234983AbjKUX5b (ORCPT ); Tue, 21 Nov 2023 18:57:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36326 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234947AbjKUX5U (ORCPT ); Tue, 21 Nov 2023 18:57:20 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0099C1A1 for ; Tue, 21 Nov 2023 15:57:16 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF890C433CC; Tue, 21 Nov 2023 23:57:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1700611036; bh=Kbe8XGZbLDUllBFU/Mfn+D2rr3svacMDADLa8sIZMi8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XUNEFwrZo225RtXVaOe/hy+9Kvk/BDvCi0m0LK/GZN9DL8vPOWrhlAUEqW4o69p0e Rr6JSs06aPB9kL8BU3tnPfugX+oMtpUSGg6UZ2QaUUxgIhCEYfmUs2Xb8QKdknTF27 55Opvav/2/yfgE+9o35iaZGTGWOTzz4sKpKyCf3fqhWslI5tfiOfoSLExDrxPmyKJW 9+TwJ8ReL+/R77yKVO3CtZm9xUeE8dUXzEoCNJcC3XH/tBROytVwoUxHXeB+KdIt6k EXRmQtkK8vshbpVr6ISpOGV2wx6J5bXklopRc0DTPdzcCYHYlHMAXs/syv8/YBYCbB UvpzJntMow/ng== From: Masahiro Yamada To: Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org Cc: Masahiro Yamada , Andy Lutomirski , "H. Peter Anvin" , linux-kernel@vger.kernel.org Subject: [PATCH 4/4] x86: vdso: use CONFIG_COMPAT_32 to specify vdso32 Date: Wed, 22 Nov 2023 08:57:01 +0900 Message-Id: <20231121235701.239606-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231121235701.239606-1-masahiroy@kernel.org> References: <20231121235701.239606-1-masahiroy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" In arch/x86/Kconfig, COMPAT_32 is defined as (IA32_EMULATION || X86_32). Use it to eliminate redundancy in Makefile. Signed-off-by: Masahiro Yamada --- arch/x86/Makefile | 3 +-- arch/x86/entry/vdso/Makefile | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/x86/Makefile b/arch/x86/Makefile index 1a068de12a56..0899e71ddcc6 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -296,8 +296,7 @@ install: =20 vdso-install-$(CONFIG_X86_64) +=3D arch/x86/entry/vdso/vdso64.so.dbg vdso-install-$(CONFIG_X86_X32_ABI) +=3D arch/x86/entry/vdso/vdsox32.so.dbg -vdso-install-$(CONFIG_X86_32) +=3D arch/x86/entry/vdso/vdso32.so.dbg -vdso-install-$(CONFIG_IA32_EMULATION) +=3D arch/x86/entry/vdso/vdso32.so.d= bg +vdso-install-$(CONFIG_COMPAT_32) +=3D arch/x86/entry/vdso/vdso32.so.dbg =20 archprepare: checkbin checkbin: diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index 439b52772e69..7a97b17f28b7 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -35,8 +35,7 @@ OBJECT_FILES_NON_STANDARD_extable.o :=3D n # vDSO images to build obj-$(CONFIG_X86_64) +=3D vdso-image-64.o obj-$(CONFIG_X86_X32_ABI) +=3D vdso-image-x32.o -obj-$(CONFIG_X86_32) +=3D vdso-image-32.o vdso32-setup.o -obj-$(CONFIG_IA32_EMULATION) +=3D vdso-image-32.o vdso32-setup.o +obj-$(CONFIG_COMPAT_32) +=3D vdso-image-32.o vdso32-setup.o =20 OBJECT_FILES_NON_STANDARD_vdso32-setup.o :=3D n =20 --=20 2.40.1