Received: by 2002:ab2:6309:0:b0:1fb:d597:ff75 with SMTP id s9csp963342lqt; Fri, 7 Jun 2024 04:18:18 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCVZcOs+RMCyj+NmJpyOXKBL+oXwcMnND3+IFynkiOfn4pjfK3bGfV8UoRhSVTBMxOekJztbK39RgELsWBxiD7S8kjzbxaA2eqmHFqth7Q== X-Google-Smtp-Source: AGHT+IHvBo8XSRfq5rkhHSepL6LYO0i/AyN5n93zzSG5lJKqMZJekRkyYSJstAHGH/fCOeWmaTto X-Received: by 2002:a05:6a21:33a4:b0:1af:cf63:3df3 with SMTP id adf61e73a8af0-1b2f96e1d8amr2416645637.14.1717759098489; Fri, 07 Jun 2024 04:18:18 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717759098; cv=pass; d=google.com; s=arc-20160816; b=fwMK7VqBe/KPqfpHWv5L6dfOROhktZ8VbCQga/RkdPEUGVXuS72elu2P/9+1HU7jRO QuTrrhWyasVCR1iEkdaFL62HD6GsVV93+HUNBncQLwnc6j9OOvEkfp91CqLLwZlKLvAf kor/0NiCnDf2GJVn3RrGYz2i+RuICKxIC/1c6IuRgEJi2r0tuCcvuFprYrra1Dt5KEpF RsYJPp1+xQ+nfeGnTAwUbMY77TwnLDhHJ/6oZva800EaIfFcTqHhE511nueyy8M68AAw 4w93GLB2zelXxsUi3JXFgT1IidG9e2ITryLM5AscTvctjOYDpp3R5/3lpVCbpqMHRZS+ zdkA== 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=4YiAfVJ5NScBqYjuwGX0YeFrZz7spdK1NyPMNX0/8Aw=; fh=b+GcvI4Pcayc3mqYGvUYD/O2AEP50jeeZwnwIXNAGVQ=; b=jy5B5q7oQ1bB8Jejnh7WrVYZtM2VEeuPqMu9P6C2WNud19cQLcDwimboDl4ZqWXqlq 4iLSEcfNDdar3bRcisOYzh2AXNrYANRUIRiRlBtzpk3Utt6OWQjbxEOMm/8ac+KBN2uS XHM8EqOFdxx9gwipbKkpPZRbBuffbOJ09OjnmETZO1pm4NaTf3lWxzMW3NaXGJ9vhTqQ uywz2IbIcs0yUeG/UZTSU0v8k9oRarcHfFTipPfQeNjuSb8SlGlZfY+b8y/2ieDbFf1y C+lrXS4a4fkxqCFNUtWdLihlslhRmy/bw3ou6wsct7JAN/geK64GGNBlZ9vYKdiTJsQW D3Wg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=oXBczZUW; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-205885-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-205885-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. [139.178.88.99]) by mx.google.com with ESMTPS id 98e67ed59e1d1-2c2d0e79a55si140515a91.81.2024.06.07.04.18.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 07 Jun 2024 04:18:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-205885-linux.lists.archive=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=@kernel.org header.s=k20201202 header.b=oXBczZUW; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-205885-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-205885-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 1F329283A23 for ; Fri, 7 Jun 2024 11:18:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8000C19148E; Fri, 7 Jun 2024 11:17:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="oXBczZUW" 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 A8882190682 for ; Fri, 7 Jun 2024 11:17:12 +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=1717759032; cv=none; b=hXFOVhOxT5e8YkVeuUMOSXReB/Wd4xF3JgmePFdakNroAMzziGa27Ekw6iGKeYFpOCfbN1g5VPnjGRsJd+RVgEeU8IVS4zIOk/5HIt6nb/n0cABlOiDDjw5Lsnc18JE755tR5BprgNuVj11LKRE96hDcv0xq0wrlnKT3T/XfCqQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717759032; c=relaxed/simple; bh=2DjrnYCMqznW+ee14tuQDAv3aZSnRa37n15txMb0Zbo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YoCaK6pJctyBAP/pVgpLVyghEMrLcbowTH5/nfm/CZXjlnrqc+um2PEX+PDb9HV1NNZW2a/MqzajAtSoBonFRW7tP6ZHWCYmFxqhXBelb7WJPvLzY+HYLqc+3ZLvD7knw1ISy6lz0148UwxKjQWAfBbtpW9DuWP7mMRjAkyE3PQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=oXBczZUW; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id B04E9C32786; Fri, 7 Jun 2024 11:17:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717759032; bh=2DjrnYCMqznW+ee14tuQDAv3aZSnRa37n15txMb0Zbo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oXBczZUWLuSgjM04SGEQayG3SxQ7dDGesv49NDsEu21QcbgK4KvOL6f83/SUkrlRv gWfHcUbB68DCd6PmCHnmx+yz7K0CSB6kvffh+tzypCZLiXs1sZ4ct+3BZQ6DbEKE2T tIebI1pgdWTWlj5/Et8lLq6pn/dtMpBVZPo3HWRGwrqI2lSpFFanbjAhhYTgz3xlUb PrutTGZaLXTJoC6wfCpi33WsHnHKWsSPkTAY3mYjJ9L6mkG3IvbwyUaGVP0Oc7q31G xDMgZjp98oCwrToFwcVtovqeA/mT9acijIvfcH1gqmVagGc+0+gilXH7u9TToiWNNS VoIAdLgoIjBfQ== From: Borislav Petkov To: X86 ML Cc: LKML , "Borislav Petkov (AMD)" Subject: [PATCH v1 04/14] x86/alternative: Convert alternative_2() Date: Fri, 7 Jun 2024 13:16:51 +0200 Message-ID: <20240607111701.8366-5-bp@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240607111701.8366-1-bp@kernel.org> References: <20240607111701.8366-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 c05bff2e3626..21ead5dea15a 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