Received: by 2002:a05:6500:2018:b0:1fb:9675:f89d with SMTP id t24csp416117lqh; Fri, 31 May 2024 05:36:44 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCUy/aj+tU6FOt3JiXRWaBv+o0DpxQPV0UdKBkWdEhI+zuRdwEWZHOD/igI3e/7ok/9MpL5snhv0twhElLUODwH7T9Ea77OHSuaS7yNTzg== X-Google-Smtp-Source: AGHT+IGhUyGDfJ2zXYWuwSUPbEnWVSA7P+wt+PuPwHKbnu570p8c5RKmjv/FPC8fJ6GsYLYH4Cyv X-Received: by 2002:ac2:5f89:0:b0:51f:5c3:2d6e with SMTP id 2adb3069b0e04-52b89576d43mr1230333e87.17.1717159004072; Fri, 31 May 2024 05:36:44 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1717159004; cv=pass; d=google.com; s=arc-20160816; b=jWWAIe7Xk0yIjGVJ7SM2q/wNLrxjt4BZbU9tYbNbsJI3dBNyAPr4BEy4KaepO+pHYs S1YcS5Ws2vkpUG6VuIY4b064P+u+vzfLstTKu85lVSeROBOwBRvTTHWG6nT0Wx6ZZvi9 TqqfHgm6es+0tjMT2xgJf32cxijQODDkAMI/MxMa1/Cw/KQIh8TS2QI1zyGSYLoC3TFe okGICWkio8FVhcRmc9fk/IKZkq4xK6HFx3RPIvCcviQg6cK2Kp0rEu2RZn+swEqf4LTL Gfv2Iht9y0abKPB89pRI0Cm4MBW029tYLaN2+hwnQG5xbDUWYzP0/qX56isxgU6S9Cgm 1DvA== 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=wVmI572slNqWttxp0EZ69becULRwBxuRgsx0xd6xH6k=; fh=b+GcvI4Pcayc3mqYGvUYD/O2AEP50jeeZwnwIXNAGVQ=; b=fAXw9NXrXUUHkbGHUG/7OcSdp3cCT2lF0hF6UuOxG5pHSAy+rOVmmb0BJdXDfmEebt F+TKmyMxI+dTikFJd2/VQDWNsgUbwwi6NbKJcYy7HOBDVlEnoCvfUyuhXkrYdhfZIqmm HQbPT+Q1SittRFO2GazL5RKptsFO5IYhV0CHHOGE6O+oIreVfCi6MoChdxnvncpbeuNZ ppmiUvMZFecsXVIgyuqewgDqW5h5rQztJjLqmKpiJuU69hCYfE7VotpEdhZX/ljnAQtC huMXzfIKQlSsHFmzs/JAMokCOK33XrjWTZBDr01lDL/GrLPrvgYG3rBFfqXf05QOfZ4a Zc6Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=L83qQ9Yt; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-196791-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-196791-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id a640c23a62f3a-a67eae70271si87392066b.753.2024.05.31.05.36.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 31 May 2024 05:36:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-196791-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=@kernel.org header.s=k20201202 header.b=L83qQ9Yt; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-196791-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-196791-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 am.mirrors.kernel.org (Postfix) with ESMTPS id C00721F26296 for ; Fri, 31 May 2024 12:36:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8746815A85B; Fri, 31 May 2024 12:35:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="L83qQ9Yt" 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 AC903158DD0 for ; Fri, 31 May 2024 12:35:22 +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=1717158922; cv=none; b=i+RqQjgfcjelHpbtUOwH2E4/OLrVqtbJ3Hl6EA8iJVRK6rdalhIVAf0Mg49D19X5EV5H8vHlRa5yjg8Osv3txHG+ToHtUGRAyRtC17FyLB1dnaxV5LrZIuDWWXfcedk4gu4gW0fUrFjNTp1UW7IPDz729zpWCHtEvYO6l7JN7Do= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717158922; c=relaxed/simple; bh=cPNrNecxxrCgayY/BH4V35moVx5yb8yY03jdA/pam2c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=WtFadKbiFMUTWPy5tutUZB0ATJ2RaRyAIj+ACEhwro0D390n9rz2oInLWoL3VHhE6Hda9NSVoAydLWTypETtVbxml7QfbkSJ5bb/A6O4nj/G8k1X3WJSl1P0jpTCx9l/QkdAc9vsF4qcO08TtTOoXBtBZYpbeexjfuSMuOaBfZc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=L83qQ9Yt; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 81549C32781; Fri, 31 May 2024 12:35:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1717158922; bh=cPNrNecxxrCgayY/BH4V35moVx5yb8yY03jdA/pam2c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L83qQ9YtDW9iL923oeMqVEjdUdofCz6Ge8O5JRm3tHTls5mIcbW2dmsReaGntWtLl BRGyCId/d/qi8pHT18CNmXI9N3hKurKf7xgBuA4l+69RGAuZVSe7IseS6D8Q+PFGuB EDd2SiKzA8a+UbCKTyLNPk7x4mvZtzNdF1V83TSo2iBKAfpYrLYXDrX6JLG9Oa4mvv 2N/6/bcYAw/8zv6UozON/42gp+D2zajxfSl02wAtCiNyy51CDCod2KiH9z95mKumhf CiC9oeOiwSTjz+tqdo4P3FVQH+PNyOOBrhufmNdVQaOI4akeS9zFF9dVbu+MvwkHRF mLRtJzPPskmEA== From: Borislav Petkov To: X86 ML Cc: LKML , "Borislav Petkov (AMD)" Subject: [PATCH 05/14] x86/alternative: Convert alternative_input() Date: Fri, 31 May 2024 14:35:02 +0200 Message-ID: <20240531123512.21427-6-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 | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h index 1dd445c6e2e1..7f5f26fc42a9 100644 --- a/arch/x86/include/asm/alternative.h +++ b/arch/x86/include/asm/alternative.h @@ -330,7 +330,7 @@ static inline int alternatives_text_reserved(void *start, void *end) * Leaving an unused argument 0 to keep API compatibility. */ #define alternative_input(oldinstr, newinstr, ft_flags, input...) \ - asm_inline volatile (ALTERNATIVE(oldinstr, newinstr, ft_flags) \ + asm_inline volatile(N_ALTERNATIVE(oldinstr, newinstr, ft_flags) \ : : "i" (0), ## input) /* Like alternative_input, but with a single output argument */ @@ -348,10 +348,6 @@ static inline int alternatives_text_reserved(void *start, void *end) asm_inline volatile (ALTERNATIVE("call %c[old]", "call %c[new]", ft_flags) \ : output : [old] "i" (oldfunc), [new] "i" (newfunc), ## input) -#define n_alternative_input(oldinstr, newinstr, ft_flags, input...) \ - asm_inline volatile (N_ALTERNATIVE(oldinstr, newinstr, ft_flags) \ - : : "i" (0), ## input) - #define n_alternative_call(oldfunc, newfunc, ft_flags, output, input...) \ asm_inline volatile (N_ALTERNATIVE("call %P[old]", "call %P[new]", ft_flags) \ : output : [old] "i" (oldfunc), [new] "i" (newfunc), ## input) -- 2.43.0