From patchwork Sat Dec 17 18:55:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 34229 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1635998wrn; Sat, 17 Dec 2022 10:57:03 -0800 (PST) X-Google-Smtp-Source: AMrXdXtgP6ieu8yNo7S5p1pbNXQxR5Hp+TcruJcuN5ZGQZZ6sF/N4qxrjHcQvkfhysrKf8+1MCVF X-Received: by 2002:a17:906:fcd9:b0:7c0:9bc2:a7f1 with SMTP id qx25-20020a170906fcd900b007c09bc2a7f1mr5213500ejb.34.1671303423620; Sat, 17 Dec 2022 10:57:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671303423; cv=none; d=google.com; s=arc-20160816; b=o75npmBJ2zT1B3aKGEZ+RzMgXZC2zwkJUqoSUp7CoDkIcsfbZZITt5REc7NQEE5Hpi ax9AsKHnOi3M6f/jZqOuJsTnjrTVprMoCmyPU2p7NEL5torYR5ouKHfsQPIK40GyXYF1 FVYzWdQQBzUuS9cAfI2/EkluSLH7AyTtI89F2ZGSHU/fK7oVR1ksf1mdNErXi4NATBCz 6KRD25us+qWE5pwRXTpu5x/cC8VyuLojGEUVYde6SF+6rZO6IXR8eJMTatjraGYr6r1w umP5StqKW/oUw9PaUUXjQflRvn9+5SEnxcMfyOkaM04IIw5phXFthFAkL9KZauR+sjZs 3bGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:cc:subject:to:reply-to:sender:from :dkim-signature:dkim-signature:date; bh=qIRzVhTbXlSOYmY8HvVrzYMs1/8PNFxoic35cj7YCek=; b=EM72mQVFPuruPF1VVterKp3JtH8eOx+69Q3zaq3/aXrom2Jme+ZAMVLw5WZr4oj4/h nILjnw5xHpQ9Ql47Fj7wI5MSKFkul6fyBIOkp3uMK8ogqStUEholW7v/5Vk9pTG/rAxc DNLFu69N4yJ+qMfsFZ+SWzAM51i+Bd6e+cT7VW0QCW0gHMIAcVDiHo8EVCmTzR21IY/Q AK/0ik+DBslMssf1twGyL4d8Gt2YfxPAFQx3sbVlZQSP+DB8E+VFnu8xE5TJz9o7kI/Z F2cHDPTqBdWWNkagSpv/ZYRUfLWkeLXYifc7G3qBVx+obFiCNKRiv3vetGx1gvJRHVhc vbZw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=RQoxIK3m; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=SGNpTz4M; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nb29-20020a1709071c9d00b007c4f76c4e81si5664560ejc.319.2022.12.17.10.56.39; Sat, 17 Dec 2022 10:57:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=RQoxIK3m; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=SGNpTz4M; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230171AbiLQS4A (ORCPT + 99 others); Sat, 17 Dec 2022 13:56:00 -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 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752488658666674194?= X-GMAIL-MSGID: =?utf-8?q?1752488658666674194?= The following commit has been merged into the x86/mm branch of tip: Commit-ID: e996365ee7475805d2a01312532855004e89df84 Gitweb: https://git.kernel.org/tip/e996365ee7475805d2a01312532855004e89df84 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; } -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); /* * Check the directmap and "high kernel map" 'aliases'. @@ -1718,7 +1718,7 @@ static int cpa_process_alias(struct cpa_data *cpa) return 0; } -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 = cpa->numpages; unsigned long rempages = numpages; @@ -1742,13 +1742,13 @@ static int __change_page_attr_set_clr(struct cpa_data *cpa, int checkalias) if (!debug_pagealloc_enabled()) spin_lock(&cpa_lock); - ret = __change_page_attr(cpa, checkalias); + ret = __change_page_attr(cpa, primary); if (!debug_pagealloc_enabled()) spin_unlock(&cpa_lock); if (ret) goto out; - if (checkalias && !(cpa->flags & CPA_NO_CHECK_ALIAS)) { + if (primary && !(cpa->flags & CPA_NO_CHECK_ALIAS)) { ret = cpa_process_alias(cpa); if (ret) goto out;