From patchwork Thu Feb 8 13:04:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 198385 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp153218dyd; Thu, 8 Feb 2024 05:09:25 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCX4AKuzRTkFjOfvnKUumDlviCPMgF0lyAT7pTSomMWBSAqb5EDLPPFVv9c0lUfExpNDVct5e0WwRsxvlf8nPv3xGJqwfA== X-Google-Smtp-Source: AGHT+IHwply5IFY47/gx/jIS/VxrkfiqZCmUii6MmHc3F83dR1KcvTiEAgXdRiywYXPrc/Mc528/ X-Received: by 2002:a05:6e02:144c:b0:363:bdb9:72af with SMTP id p12-20020a056e02144c00b00363bdb972afmr12459099ilo.23.1707397765630; Thu, 08 Feb 2024 05:09:25 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707397765; cv=pass; d=google.com; s=arc-20160816; b=k39iimgDkLXRUokil2w6v+Xbebc8IEjM+wQhoA9VkjrYaeic3+tKPSESgFYtXsvDd/ ChWEOz8gKweZg6Xy/svRde9mKatZAmTGLVbtPo0NjJ7tGUrhNe9PRzOQ8mFQk7WnVS7L f2CW6sKIkLbQXJbsgVJc+neYN3lFRKREhbo9lMGaqH8TPxbI6qN9+H1zGzSCSDD/2xkE TxLhj2qpL7o6RXzroo0NjbQRvd9ZsDCjwihfMN3l0bO0yhbJ22BOv9KR0+jMzgyWlap+ gsUDqNH+hbKvDqDkcHIU3wGtJvsk02N1AD7F+HItj9n8QMb8Jtm3ucP4xRj8A25ftAdH SHGg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:precedence:robot-unsubscribe:robot-id :message-id:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:in-reply-to:cc:subject:to:reply-to:sender :from:dkim-signature:dkim-signature:date; bh=zPbC25vg+lLa3ZBFGl4Zq+FRf4XhtPbXYIWS+Q2MVhs=; fh=CHfuWX1U46du1kxG13ZdsABdxb/FHiOp06Bos4GG6Rw=; b=CuMYyLK0/nKrd8Y0VyjmCQm1R7DQla+4NhphtQSwmTT2g1l/TNO/X69yZt7KKJZcPi KLotC1MgYPXdo8ahoxbdgv/XG3selhs7EblaTxYW2HOuVN0F4OknpGd1+bDyhreQ9gHB +d0yqLAIDZHY1Dbjfx8zVfTma34oYGbN/IzgDHZIIFDV9EsfXzvh10vPDrsg8rhoZ7O/ ci7LGgEn7w4KxUBscOqBtb5G5zvlifnf7yMC+BZwweAHyzm3mip6q+GsmZbg0lZIEsbH YbKI4GXx5y/NE9sHumm0D/ju22UixkIhI1SPkVOV6KNthSese6rbg9MN/7CZCFASXMsS M5ww==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=DYBW9kB0; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-58106-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-58106-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de X-Forwarded-Encrypted: i=2; AJvYcCWl/HLu3CwjN64G22rzupWw/o7Ja94dn6rQPKxlz9JsKheV7VIxqbOQ+qdZVORTOekL+DOMmpIItYtIj96lFOPxoS9/Rw== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id ck21-20020a056a02091500b005cdfb651211si4212919pgb.441.2024.02.08.05.09.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Feb 2024 05:09:25 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-58106-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=DYBW9kB0; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-58106-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-58106-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 7A66128A3BC for ; Thu, 8 Feb 2024 13:06:13 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 932C67994D; Thu, 8 Feb 2024 13:04:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="DYBW9kB0"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="MYw7lRvL" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 0B7677691F; Thu, 8 Feb 2024 13:04:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707397483; cv=none; b=keBPSVsbQ39cQZfj5bkq7fkSFwM0qQDlIk8SLtSkRc3TWasQr0JDhS6S49YRgevSZYVfGYCiskEaXs6oJbpybXOxmEIm24OXL/wdw7xHy5E7AtddfX0mlDeiuNPWTbj5yo4p82k+VXwCr7GHg9MiA+ZANYt5s9xRA3qSc+eq6aU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707397483; c=relaxed/simple; bh=r0jE77rdo6Ue1DCrYWr0IcRSr6YcbHSatdaQvJjCqVU=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=dX1f6i/DZSpDQQRLphv6HFzIbnglb9QcmK5nx6KipVgBK1k56bRm3rroa7IUCFot8UDuqb62muTDDfE3zbd2CZmFxyeaRtNYqZef3vAXE8BKvbWHEuYsjYWk/JX0KG74chEHAFGV6bUORxYZ4tu0A6DqdPWZMZ3lDHCL1EWST8c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=DYBW9kB0; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=MYw7lRvL; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Date: Thu, 08 Feb 2024 13:04:39 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1707397479; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zPbC25vg+lLa3ZBFGl4Zq+FRf4XhtPbXYIWS+Q2MVhs=; b=DYBW9kB0Pg+Oni4fYFcLTUCbQ/+x1yYFKtEt9OJzNasq0GsNU8UO7rHto3voNch1fSXL8y BfAuJY5JXl4kvH1cQ9u2S1vhhj1fbI5cKFs6N/AR9oK/6WSuO9/HhgcNAZ+2gKfSe55NPw 1r7nHxg92yFTfCQ548O6Trt2LLPslS35jgOKjeLgzaFBYdVd+YoBG+gxxQLiyzEayNjR1x m7NbpSkhGfoqBBusA4eekO/cxA8zQQgqGlRlZkrwGQpHJ6KYFS2g0jjBx+EgH9dJef8DTo DNG2SjHzHtxcxI1ni2U0WYGvx1WcKiSwYSv2ouUs8PhO4DBirVdbqicBtI0OeQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1707397479; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=zPbC25vg+lLa3ZBFGl4Zq+FRf4XhtPbXYIWS+Q2MVhs=; b=MYw7lRvLVjLyd9kEbx4+6y1RSwhqJTLW6t4LgogHqFbWBLfRobGd7MvomgGZv+9qoBkF6k zKIFD22XSPnXjZAQ== From: "tip-bot2 for Masahiro Yamada" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/vdso] x86/vdso: Use CONFIG_COMPAT_32 to specify vdso32 Cc: Masahiro Yamada , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231121235701.239606-5-masahiroy@kernel.org> References: <20231121235701.239606-5-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <170739747901.398.12579593288355831715.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790336319173441065 X-GMAIL-MSGID: 1790336319173441065 The following commit has been merged into the x86/vdso branch of tip: Commit-ID: 289d0a475c3e5be42315376d08e0457350fb8e9c Gitweb: https://git.kernel.org/tip/289d0a475c3e5be42315376d08e0457350fb8e9c Author: Masahiro Yamada AuthorDate: Wed, 22 Nov 2023 08:57:01 +09:00 Committer: Borislav Petkov (AMD) CommitterDate: Thu, 08 Feb 2024 13:23:14 +01:00 x86/vdso: Use CONFIG_COMPAT_32 to specify vdso32 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 Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20231121235701.239606-5-masahiroy@kernel.org --- 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 2264db1..f2260ac 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile @@ -296,8 +296,7 @@ install: vdso-install-$(CONFIG_X86_64) += arch/x86/entry/vdso/vdso64.so.dbg vdso-install-$(CONFIG_X86_X32_ABI) += arch/x86/entry/vdso/vdsox32.so.dbg -vdso-install-$(CONFIG_X86_32) += arch/x86/entry/vdso/vdso32.so.dbg -vdso-install-$(CONFIG_IA32_EMULATION) += arch/x86/entry/vdso/vdso32.so.dbg +vdso-install-$(CONFIG_COMPAT_32) += arch/x86/entry/vdso/vdso32.so.dbg archprepare: checkbin checkbin: diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index 439b527..7a97b17 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -35,8 +35,7 @@ OBJECT_FILES_NON_STANDARD_extable.o := n # vDSO images to build obj-$(CONFIG_X86_64) += vdso-image-64.o obj-$(CONFIG_X86_X32_ABI) += vdso-image-x32.o -obj-$(CONFIG_X86_32) += vdso-image-32.o vdso32-setup.o -obj-$(CONFIG_IA32_EMULATION) += vdso-image-32.o vdso32-setup.o +obj-$(CONFIG_COMPAT_32) += vdso-image-32.o vdso32-setup.o OBJECT_FILES_NON_STANDARD_vdso32-setup.o := n