Received: by 2002:a05:6500:2018:b0:1fb:9675:f89d with SMTP id t24csp416233lqh; Fri, 31 May 2024 05:36:55 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVaDtiwshaAWoYaE0uhkj4pHLMLsPX4sf5CcDanky/0SqxkBJE+setUtJqG93xQFEUfGs5TPS1XRvHeARVlr4iX96DZbQcINn6WUgiMAQ== X-Google-Smtp-Source: AGHT+IFuMYZBBrdXfakvGLbDfMvFFWWbuRNb8DmTwq00w8XVROKVW0MCHVuldO2nHSdR64UtbkWJ X-Received: by 2002:a17:90b:360a:b0:2c1:bcf9:10d5 with SMTP id 98e67ed59e1d1-2c1dc56045dmr1464427a91.3.1717159015053; Fri, 31 May 2024 05:36:55 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717159015; cv=pass; d=google.com; s=arc-20160816; b=KSZhxbwDZWfSaV4MXzbT6TrET9wWgTvnvr2DdvqE1gDDBHUAbntu2ZnGZIliOPFOtX YObu2MNkLASglPvuwIgtoHAVXdfbkGC6+k9BrDJNeolZQtTxLhpAm3I81GbN7SrlgzPh k4fo7KPaLf2eAeh7gCysFpz9zwUJi+fZA2eKqbSkHmEMK2ljb8Zm2YlFo2pLACahU3/o b39wooIEAI2X/2g9rPXVGtofiGWJWPs0SlnFLyrqNNwW2NDXioikhzrXzvhAN5FqMruj yyOI2yllfXaztRbWVj2QQTI/aANXhjNtbOrlq0DeaBIuSAJrJYF739zi6dQMaaN1g98F OQsQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=VLDrc4TmgFiRZA7W6Sqeje1xjl1jtkiHSDUeGL4+GXM=; fh=b+GcvI4Pcayc3mqYGvUYD/O2AEP50jeeZwnwIXNAGVQ=; b=YuRPwcn1NF0FJ5P5x080m2ylKT8loi5tQXKfizCw/uc4BEdhonP6kaydkXksRFfWdb CYTZHXIlCa55Nji2brZMm7fydg3cl5CJNg/r0OxEB8ujTnUSVnVai9Unx1TBUWMSfxnU Z4LSWuoacQUj2yyeHu553UbBL23O5EJ8RJPZMpxBM327KApP4u4YBnDJfIloqqLvB4ov OeneEomQhmqiRRc3XkLp78PZlBlZHrktZ5mkOiqrjvEBmBLN+qWb7U143n12PVW10cwF WPOBGCXM390f8LgOuzyBel/XIMluBruRrxh09Rq/wD8bFFDVqvxRU2toSmSJpE2OoLR8 J0rA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=aMIg2FBG; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-196790-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-196790-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id 98e67ed59e1d1-2c1c282bebbsi1503686a91.90.2024.05.31.05.36.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 May 2024 05:36:55 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-196790-linux.lists.archive=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=@kernel.org header.s=k20201202 header.b=aMIg2FBG; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-196790-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-196790-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org 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 A3750287956 for ; Fri, 31 May 2024 12:36:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 55DEA158DC4; Fri, 31 May 2024 12:35:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="aMIg2FBG" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 815D915884D for ; Fri, 31 May 2024 12:35:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717158921; cv=none; b=mVuyZGfk0RJI0IA3CHoWjo0F7klkGtfbSjKFmsCmN7u/EmIIIHHZAgO54NhbnHBtmDBNkd77JHK+RychFD2e4ph+Dj6Hp6/Q5X/cxRUxgMOZ2dcRKbNe3lWBKwn2W5wPm/8i6TqFhWsqfCqsalbZ6HD0FWwSFeef3IGpDGY0YeI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717158921; c=relaxed/simple; bh=OZwBq4zhE7sZbzL9CtiglYHCMatlBRlDf8o+veIibKs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aWpPqUH3Nqi1zRaKIQF7ui5tzPpJCJVxfNHKQOZqae2wXVb0EyTHrHw8nduz7X6r4vpKoNd4s6eP9j0EDk3zzBQPegeaTmJNbVc0+7W9jBIFBcl1RgWdIrIWU6krQH6OGT/dCUGNF0DRwGxc2RQJ+CPjjm51osqB/911OixFwjw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=aMIg2FBG; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 41976C4AF07; Fri, 31 May 2024 12:35:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717158921; bh=OZwBq4zhE7sZbzL9CtiglYHCMatlBRlDf8o+veIibKs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aMIg2FBGQtew7H+4WbkjVChd1F9CQ3bw7TkT9hA1ddo3nml6Tsr5zspAvpS6Hh6DF hfoVmOE4Ia/SGGcxF4Xru9MqifCVnBlspdARggAnXiyiTzQ0+J8uEi6GN2H7VbMUT/ O75qoNcjFpdaRDpdMVZzV564wRZgi4YmDGh4oiYME68yvz7GVTaV3KGCN9GLz6Kj+q /+LdsrJets0FAODfcHGu5p/GNc7h2weHGYwWNyccJDxRcyjhmdgNLSSsyRSoIask1m sAJsDtJwu2ZV1cJRcDAGQRgTNcAf5c6um0Me6egqNw6K4l7Cb1YADLUv3SD6fvwqie vERkV2LmH5RKQ== From: Borislav Petkov To: X86 ML Cc: LKML , "Borislav Petkov (AMD)" Subject: [PATCH 04/14] x86/alternative: Convert alternative_2() Date: Fri, 31 May 2024 14:35:01 +0200 Message-ID: <20240531123512.21427-5-bp@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240531123512.21427-1-bp@kernel.org> References: <20240531123512.21427-1-bp@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: "Borislav Petkov (AMD)" Signed-off-by: Borislav Petkov (AMD) --- arch/x86/include/asm/alternative.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h index c622ec7c4462..1dd445c6e2e1 100644 --- a/arch/x86/include/asm/alternative.h +++ b/arch/x86/include/asm/alternative.h @@ -319,9 +319,6 @@ static inline int alternatives_text_reserved(void *start, void *end) asm_inline volatile(N_ALTERNATIVE(oldinstr, newinstr, ft_flags) : : : "memory") #define alternative_2(oldinstr, newinstr1, ft_flags1, newinstr2, ft_flags2) \ - asm_inline volatile(ALTERNATIVE_2(oldinstr, newinstr1, ft_flags1, newinstr2, ft_flags2) ::: "memory") - -#define n_alternative_2(oldinstr, newinstr1, ft_flags1, newinstr2, ft_flags2) \ asm_inline volatile(N_ALTERNATIVE_2(oldinstr, newinstr1, ft_flags1, newinstr2, ft_flags2) ::: "memory") /* -- 2.43.0