Received: by 2002:ab2:7b86:0:b0:1f7:5705:b850 with SMTP id q6csp1364690lqh; Mon, 6 May 2024 05:51:20 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCW//K60A5ML8aZ2UG4eAJinHOO5ekcWFH7qmexV/RPYr4jKrVJYHTmPf0l95gLRIV/mKqnjzgvOg3z2YMVnASLINQeBaqtOEHAMT2amzA== X-Google-Smtp-Source: AGHT+IF4skCyBcB/4bY12bZl+T8mpizS+mwD4/B8NLyzMMi7Tpfl3IMQXsKp4pGakfNDX7+wOoL3 X-Received: by 2002:a17:906:3e4e:b0:a59:a64c:9a26 with SMTP id t14-20020a1709063e4e00b00a59a64c9a26mr3992805eji.23.1714999879915; Mon, 06 May 2024 05:51:19 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1714999879; cv=pass; d=google.com; s=arc-20160816; b=tM3o/oAc9xbgPu9wqCicFe9Ri006PeUjmG0K4wmWwWysDbNoLbBbE0w9Ica8wz5v9J eo5mhuFzKsTnu+tS+oCC4WS1IaWm60pf/ZEVLGZwzjhoRYArSCsGr7thBERKlLt2/Tmx ju3f68AbmmaN5LufDvculyS3/ralQJorcdJc4Xp96HSU/fZJ2iAEYjZMq5xrMAsOryJt R7MDa9rrsS9rPHnUrRd4JQFUSerlN2Spzcyk850bblg6cfeRS2NJqMwo4Zw0eX+nnd1c 2XBXHKOsojd6NC5ZdkT5SBhQglbcReQBB3Ld0ZBtZk0tyZQxHjMlzQlnZuxrY5WgDuCp z/ag== 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=M1ZBY+BbMdsCz/HAj/ALR7pCIHzRHF2huH/d4Yke+r0=; fh=rR8KC3MdVVkWqW1DLWNOtxrtJ4e446FIKUSpWnemrcA=; b=eGXGw6rSPSv4uz8AVoEZRccdHkDea5MkLszKl9UOhuk1wFkaawy86mGRSVOoPslxcF lXsFyh//VNAWA98ffdb8rXzYGdBXG/QRMY78EaIQRIcn0MIS+RIh9T3qKlg/egOx/ii1 ckV5leYbg+HqfQJaJLW2YXO1XSQYIUJSGH/4s3ysz0uN8r1jvyAaGkyJA1EHE3SQjpeN aVcwxvLqAl3fF/EHJl5dWkPU5RNnDWRctFaQPzpezSNGiz8NcQ+XoPBsY6mtNXJ3Ab20 l7jegVDPGlat8bcn1w33ZzW9Vc+gxnbfjoDwfyNuh01Ae4QYQcusifz6NWnOaaBGdn/v ay8A==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=PEhX7xTC; 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-169841-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-169841-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id c7-20020a170906170700b00a558210abd1si4658346eje.905.2024.05.06.05.51.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 May 2024 05:51:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-169841-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=PEhX7xTC; 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-169841-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-169841-linux.lists.archive=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 am.mirrors.kernel.org (Postfix) with ESMTPS id A0E6D1F22DCE for ; Mon, 6 May 2024 12:51:19 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D466B4EB4C; Mon, 6 May 2024 12:51:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="PEhX7xTC"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="fkSERiCu" 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 1B4071DFED; Mon, 6 May 2024 12:51:09 +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=1714999872; cv=none; b=AqMDRLYoXwuFUjtDt8RNyPR/Icbo0fWFxushZd9T+1KiFIsqw0mLY6Eth76FS13yK6J1yr8BmYRwIiIe4/ur2q4HeP3oH4Jpd7/iEzTuQQLJp64Xc0HKVVDJaFGBFSSY9UE4A/4yn3VjMMhQU7u7POu/hankosdgV1sqrP2X5N8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1714999872; c=relaxed/simple; bh=3Ao0x/m2mpxl4SFB3+8g1f7cnMl1hk4Nf58EF0zRgVM=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=nX9VnjLZPMvfrAn5IQJ1t3U7KxqEEed/+5S9Z0I2S6rxXJXRQyYIsArF8gJxsJEHb7LTutC4rVJnoxmvqNSlNG20e2/ixisuuvWp2n9ZA4dbR6bE716qoCB76m+o6PTq1fNf0elfYLfGEZVaGlVMuR4kqnxR+gw/Ms9Zw6QvrwY= 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=PEhX7xTC; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=fkSERiCu; 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: Mon, 06 May 2024 12:51:07 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1714999868; 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=M1ZBY+BbMdsCz/HAj/ALR7pCIHzRHF2huH/d4Yke+r0=; b=PEhX7xTCnbDcj4HNREaccKDiqbGu4CRhubokuZwBmyWLX+bof+1J4lifvnFMyfx438snHp gmK+wkqzri5yMTZBrfJ+7UVC3PbD8wR/MvRqb+dqQrggSB8KqvN9H+iGVWfU5FOTxPvpql 1m+CRMZ0eQ4maUEEz/KynCT7U4EzgyAqfYJNcf7dRGMmrUhzKTFf1borAlPPchm67ozAeM WnCpR2vIEV9sAEQXsr5Hc8UI0P7ZaRIXUrqcc3M9MpFrz565uvLz4hrxXtwhcS49wU8Igz 3ICbIJTjs9+HJQywWhe7ci4DUXFXgiL3pWxBqS51FCwALus/xLZXdjloJqii9A== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1714999868; 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=M1ZBY+BbMdsCz/HAj/ALR7pCIHzRHF2huH/d4Yke+r0=; b=fkSERiCuy1veK0BrWxmsMAZuH3y2M5J5SVM2CvyGzgxkSc5UDOQ1IUAeGALLXp/wFsqGXF NnzSR8tyNPmSa4AQ== From: "tip-bot2 for Borislav Petkov (AMD)" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/alternatives] x86/alternatives: Remove alternative_input_2() Cc: "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20240506122848.20326-1-bp@kernel.org> References: <20240506122848.20326-1-bp@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <171499986751.10875.10656752309329992312.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit The following commit has been merged into the x86/alternatives branch of tip: Commit-ID: 8dc8b02d707ee4167fffaf3a97003bcdac282876 Gitweb: https://git.kernel.org/tip/8dc8b02d707ee4167fffaf3a97003bcdac282876 Author: Borislav Petkov (AMD) AuthorDate: Mon, 06 May 2024 14:28:48 +02:00 Committer: Borislav Petkov (AMD) CommitterDate: Mon, 06 May 2024 14:30:54 +02:00 x86/alternatives: Remove alternative_input_2() It is unused. Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/20240506122848.20326-1-bp@kernel.org --- arch/x86/include/asm/alternative.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h index 67b68d0..c595358 100644 --- a/arch/x86/include/asm/alternative.h +++ b/arch/x86/include/asm/alternative.h @@ -286,20 +286,6 @@ static inline int alternatives_text_reserved(void *start, void *end) asm_inline volatile (ALTERNATIVE(oldinstr, newinstr, ft_flags) \ : : "i" (0), ## input) -/* - * This is similar to alternative_input. But it has two features and - * respective instructions. - * - * If CPU has feature2, newinstr2 is used. - * Otherwise, if CPU has feature1, newinstr1 is used. - * Otherwise, oldinstr is used. - */ -#define alternative_input_2(oldinstr, newinstr1, ft_flags1, newinstr2, \ - ft_flags2, input...) \ - asm_inline volatile(ALTERNATIVE_2(oldinstr, newinstr1, ft_flags1, \ - newinstr2, ft_flags2) \ - : : "i" (0), ## input) - /* Like alternative_input, but with a single output argument */ #define alternative_io(oldinstr, newinstr, ft_flags, output, input...) \ asm_inline volatile (ALTERNATIVE(oldinstr, newinstr, ft_flags) \