From nobody Wed Sep 17 15:58:56 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D8CD6C4332F for ; Sat, 17 Dec 2022 18:56:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229659AbiLQS4C (ORCPT ); Sat, 17 Dec 2022 13:56:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229974AbiLQSzf (ORCPT ); Sat, 17 Dec 2022 13:55:35 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C3C110B74; Sat, 17 Dec 2022 10:55:35 -0800 (PST) Date: Sat, 17 Dec 2022 18:55:30 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1671303330; 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; bh=qIRzVhTbXlSOYmY8HvVrzYMs1/8PNFxoic35cj7YCek=; b=RQoxIK3mqJrHDWQQXWIU04aO3NryKZRephnd+AqetljY1ZQOWg4Ev9UtLuug+QcD/Rk1Op i7pTdaAOO6yT9KBYsVHY1Hh8YJjkHff/zfIbZsBKOJlCdgeKtNu+YQH8UrRItT/uj3Kg+/ W/mybM5Ibgf90PpUawJRZb0HhJvjKORavKR0sTH0lQO+6jUgP9poouLcY2ScUysOQSd8h8 PRygCqfIO/eB7+MdkrlPAF1fwFF11iIKthNT3oUFndPOJKT8tF3VlFRk+q4XtassFOWOyI fIrFEnaUYy5fBUGdUMvD/q70i4f+HLJGnWixBK78HbgbEeI/eAytw9JozmcU9g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1671303330; 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; bh=qIRzVhTbXlSOYmY8HvVrzYMs1/8PNFxoic35cj7YCek=; b=SGNpTz4MYbbWgFaHtSJJxneBaOzYN2Hg9Uxr3npP3lqgN9QTiwDcC94vOdZpPv3dSnKrJW puLLwckiXFN3kpBw== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/mm] x86/mm: Rename __change_page_attr_set_clr(.checkalias) Cc: "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Message-ID: <167130333055.4906.11541544324914437438.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/mm branch of tip: Commit-ID: e996365ee7475805d2a01312532855004e89df84 Gitweb: https://git.kernel.org/tip/e996365ee7475805d2a01312532855004= e89df84 Author: Peter Zijlstra AuthorDate: Thu, 10 Nov 2022 13:34:00 +01:00 Committer: Dave Hansen CommitterDate: Thu, 15 Dec 2022 10:37:28 -08:00 x86/mm: Rename __change_page_attr_set_clr(.checkalias) Now that the checkalias functionality is taken by CPA_NO_CHECK_ALIAS rename the argument to better match is remaining purpose: primary, matching __change_page_attr(). Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/20221110125544.661001508%40infradead.org --- arch/x86/mm/pat/set_memory.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/mm/pat/set_memory.c b/arch/x86/mm/pat/set_memory.c index beef774..220361c 100644 --- a/arch/x86/mm/pat/set_memory.c +++ b/arch/x86/mm/pat/set_memory.c @@ -1641,7 +1641,7 @@ repeat: return err; } =20 -static int __change_page_attr_set_clr(struct cpa_data *cpa, int checkalias= ); +static int __change_page_attr_set_clr(struct cpa_data *cpa, int primary); =20 /* * Check the directmap and "high kernel map" 'aliases'. @@ -1718,7 +1718,7 @@ static int cpa_process_alias(struct cpa_data *cpa) return 0; } =20 -static int __change_page_attr_set_clr(struct cpa_data *cpa, int checkalias) +static int __change_page_attr_set_clr(struct cpa_data *cpa, int primary) { unsigned long numpages =3D cpa->numpages; unsigned long rempages =3D numpages; @@ -1742,13 +1742,13 @@ static int __change_page_attr_set_clr(struct cpa_da= ta *cpa, int checkalias) =20 if (!debug_pagealloc_enabled()) spin_lock(&cpa_lock); - ret =3D __change_page_attr(cpa, checkalias); + ret =3D __change_page_attr(cpa, primary); if (!debug_pagealloc_enabled()) spin_unlock(&cpa_lock); if (ret) goto out; =20 - if (checkalias && !(cpa->flags & CPA_NO_CHECK_ALIAS)) { + if (primary && !(cpa->flags & CPA_NO_CHECK_ALIAS)) { ret =3D cpa_process_alias(cpa); if (ret) goto out;