From patchwork Thu Feb 8 13:04:41 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: 198386 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp153396dyd; Thu, 8 Feb 2024 05:09:43 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWojukr0QF0kDlkbW4HGO6gkys0C6mHkZICJ+g4L+D14aZzG5mGRwYxc9riXPEjqpWv06G1Yi5trQOrPCWDa4Swhp6gMw== X-Google-Smtp-Source: AGHT+IHYNjVgCog0Erw/YXsY/HlsQ8Cs95fJFKGcxJIMZJqaDOZ/kSrI3z55V84w67mX22eYUsv+ X-Received: by 2002:a05:6359:4599:b0:178:7554:df34 with SMTP id no25-20020a056359459900b001787554df34mr5233580rwb.18.1707397783236; Thu, 08 Feb 2024 05:09:43 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707397783; cv=pass; d=google.com; s=arc-20160816; b=K/0+lTMzYB7p8b13dG2vD9p6/ehqu0mjvVrz7BMRiYUAQ+AX04i35jUoCwLQVoaf17 fXzsAyoreZ44f6xeUTovv905n0EyAcp0nwgOHNR9M/ui8rFZ14ma7/K28uo2bWVV2TpG HWANYnoOsbXpHpBz5GBezOs92JF15GKJtVcr8Ae3+LxIgLuduONRSz67hjVNYJ0JiCgH JbXHh0W7lGWniVnrUulWvfZrHsnZIDANV+/fc/X+YwBr7IGMoQDW/COfoJ694nQOId8V pwNoIcbzg0PkkRjGtkq68cDoncUFqJAWFSemUmc34ET/XWXYKmWIHvBmuyErsXyc0x+X LzZg== 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=EU8Czi4uoNaAF5ZiLqTmJVk8S6mrBMl8Jdh0PpJc20k=; fh=4u7ru7XV9OQGEKcVyzUdhTw1MAJHBoIWVS1LXvhCL0I=; b=NG+FfBBZgt+JSsqfB2NWWLlc5g36RVo/02aRiji2ZI5ENTajWyJqn+uTS1a9J0sjaN 4pgT9ftQ1n40/5dSOcM4pgsT1uLiNL0J3TmubPtZ92TCs1z28qtqS+ls0Bs8TnQy3ZHj OpiVn0+ztgO1CkH4eeJZad/STuMGaqAZ6ibTMVlOHHKaXpagCqwmuWjrdEhWqDmxOWn2 8upJ2lazOKc3TN/q2cQfbHozBO4R27xvbtIHiVLpq2plBeyrgOXZgasGgRsN+AJkeawR rBssAnnLW1txY1D881/caZeErpg1SwOVIK0fWuLj4AkdE30YhbzeiISyK57tzi2BI3bv IDYg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=hijtnYGI; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=PqNpBAEo; 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-58109-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-58109-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de X-Forwarded-Encrypted: i=2; AJvYcCVIZ3PqlB7X9hGl6XuKT/FgPidaSms93ppWchgH4yIw83aZKUYqy9hByKWY1g1zSyi01bKCaUTXiqXcu1PWxkFXnsm46A== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id a19-20020a637053000000b005dc4219ac31si1706189pgn.139.2024.02.08.05.09.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Feb 2024 05:09:43 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-58109-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=hijtnYGI; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=PqNpBAEo; 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-58109-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-58109-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 1290B28C357 for ; Thu, 8 Feb 2024 13:06:38 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B5D387AE79; Thu, 8 Feb 2024 13:04:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="hijtnYGI"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="PqNpBAEo" 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 67D4178675; Thu, 8 Feb 2024 13:04:44 +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=1707397486; cv=none; b=nNfoabvtIGOh9c9h/D7Jezj0Z+2inVGrDKJHW3GYtGPvxKkzqmSo7sWFb6uZtto4y0U6RQjTZ553rY4wE3mT669TmcxiHFHoeq11DY2Iq/PoPnHqIG6aCVQEef5djKal8O42M4xys4khZNTjUXcMo/XTUJHm6kbG1cqndDVz1Mw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707397486; c=relaxed/simple; bh=zD2hAS9rFCsvLHQ7O5g+Y8FQqGWZOYZTZSVmQS3E41k=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=RDbcn8kqy5puEp8NKC2/n/MkUai7Ct/78nOM610r7a4W8ZJJM1drCFfddpccoH2UB//6HbBB3/zf+6nCLg+r1xk921S7dCh4v3ASX+qcu7BU2RvE9bqZI3CZGD08GCUcQZbgrd1FITiVjBsaqqMUsp5jGkH7qhVJdZ/1BfreIn0= 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=hijtnYGI; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=PqNpBAEo; 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:41 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1707397482; 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=EU8Czi4uoNaAF5ZiLqTmJVk8S6mrBMl8Jdh0PpJc20k=; b=hijtnYGI9XkBEhO01UElvN4KSZ/0pY4usSGwTcs+d5vuhy2nwAAg9cH535fH7vSqgcnYPs 4QhMw01tJ3ljn4Ut0+l1UQtW35gdRmsFgUgkQdpTzFkkaAfoeuLHNV4eQD+e8SbPL7XOoz 6GtHzAg2BuJNNAOvqIB9FXtoFe/I5sKX8oK6IHe0a6vVexScO1ueT1qBULVh95TpV95IK3 lFST4bC7r/f4pSANthr6Dt/NiFPU0+rJ2ne48Pl6KQhSpT5/2VPlcuQOymCVladcLQxp8W GsXOyJ7t2CFV3T4rxl3DomRxBRBqk1f1V8EuBAsbOClE7h+LUgF6gZ/MU/ygiA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1707397482; 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=EU8Czi4uoNaAF5ZiLqTmJVk8S6mrBMl8Jdh0PpJc20k=; b=PqNpBAEoumW8Qj1LII2KBJRN+UGxjSBWpt8CWYHsHXnEgCiSQ05U8ziiQxi0PZRKQ7cDJK ahwKXx+pupkRdCDg== 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: Consolidate targets and clean-files Cc: Masahiro Yamada , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231121235701.239606-2-masahiroy@kernel.org> References: <20231121235701.239606-2-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: <170739748154.398.15079300167705030498.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: 1790336338015814092 X-GMAIL-MSGID: 1790336338015814092 The following commit has been merged into the x86/vdso branch of tip: Commit-ID: 31a4ebee0d16a141b18730977963d0e7290b9bd2 Gitweb: https://git.kernel.org/tip/31a4ebee0d16a141b18730977963d0e7290b9bd2 Author: Masahiro Yamada AuthorDate: Wed, 22 Nov 2023 08:56:58 +09:00 Committer: Borislav Petkov (AMD) CommitterDate: Thu, 08 Feb 2024 13:15:41 +01:00 x86/vdso: Consolidate targets and clean-files 'targets' and 'clean-files' do not need to list the same files because the files listed in 'targets' are cleaned up. Refactor the code. Signed-off-by: Masahiro Yamada Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20231121235701.239606-2-masahiroy@kernel.org --- arch/x86/entry/vdso/Makefile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index b1b8dd1..2038d9c 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile @@ -55,11 +55,8 @@ targets += vdso32/vdso32.lds $(vobjs32-y) # Build the vDSO image C files and link them in. vdso_img_objs := $(vdso_img-y:%=vdso-image-%.o) -vdso_img_cfiles := $(vdso_img-y:%=vdso-image-%.c) -vdso_img_sodbg := $(vdso_img-y:%=vdso%.so.dbg) obj-y += $(vdso_img_objs) -targets += $(vdso_img_cfiles) -targets += $(vdso_img_sodbg) $(vdso_img-y:%=vdso%.so) +targets += $(foreach x, 64 x32 32, vdso-image-$(x).c vdso$(x).so vdso$(x).so.dbg) CPPFLAGS_vdso.lds += -P -C @@ -190,5 +187,3 @@ GCOV_PROFILE := n quiet_cmd_vdso_and_check = VDSO $@ cmd_vdso_and_check = $(cmd_vdso); $(cmd_vdso_check) - -clean-files := vdso32.so vdso32.so.dbg vdso64* vdso-image-*.c vdsox32.so*