From patchwork Sat Dec 17 18:55:31 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: 34234 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp1636153wrn; Sat, 17 Dec 2022 10:57:44 -0800 (PST) X-Google-Smtp-Source: AA0mqf5Rk4VTcm95koqDewrdjIvSKYmFK06jm2n8/7g3OVcRWMM0NeLl9FDhWxJrAYWOWVDkAcyD X-Received: by 2002:a17:906:840d:b0:7c1:4b17:3323 with SMTP id n13-20020a170906840d00b007c14b173323mr26675117ejx.7.1671303464623; Sat, 17 Dec 2022 10:57:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671303464; cv=none; d=google.com; s=arc-20160816; b=BgnNLZCljpl7RyszLuVuQwC5WFSuSuMqAEcslxiQ7LpcafTBRIccmQW4Z9Ta5jfYN7 WRj/uxgMLv/ohcStEUa3gP8aXGxOZ34qOVMLKMfalRrvr5thIJuFlc4KDwGloOZhxgYY OPpAU1pSAz4Pu3Xwys44wC/1BjLbzyoTTupmqwIz/NnQNZ18Z8trdJfCSknSJls756q/ /lC42Mo79n2yMqs/dq5sSyS3CIZzz9/toCL5c8848xWuQ/5GM0aXS0woV8eI5yPg+41E pwylU8c023dYZgCYSbbqT33GVfC5OyOulyvyCsg+WkYdqIdK/MBGGUZb/OhMENsUk9X5 3qSw== 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:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=xHpGwxUQkPt+O/DJTHMvCsB7Jq4sjGs1fkAvGvyj3es=; b=FHraTB3ZI6kX/eiNNAKlLXXNjvXoXVMPm+IqXITZMiiaRzwDzYXbxFCWVKHSj2kqjK kPLfmBZvVIntUBvpovmcjb/D51Dia77K70ya6JrMX1u+Ok8fi7WoZAmcgdbRqb3LNQTh NzMxT6YAqtnefBY7uE1n2phF8ByQZhadpVp76avz5VPZI1Ycxzy8vWyOe0DPGITQOC+b tneot6ICteiwIBs3Nl5A8DyczdkjD8atWvJImbFEZDDuu0MQgrCZXxTphVLhR863oWIw s2WKjlDsTjpRRLOQNRFDhzjbZSQ69du5y6h6D4O8JnuoqKYLmgEY8VCR1y2jyYpQ/D0o xOrA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=j7VlJPif; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="++oauI/v"; 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 lr6-20020a170906fb8600b007c10bb9225bsi4327730ejb.975.2022.12.17.10.57.21; Sat, 17 Dec 2022 10:57:44 -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=j7VlJPif; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="++oauI/v"; 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 S230296AbiLQS4i (ORCPT + 99 others); Sat, 17 Dec 2022 13:56:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40794 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230024AbiLQSzi (ORCPT ); Sat, 17 Dec 2022 13:55:38 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA9AB10B74; Sat, 17 Dec 2022 10:55:36 -0800 (PST) Date: Sat, 17 Dec 2022 18:55:31 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1671303331; 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: in-reply-to:in-reply-to:references:references; bh=xHpGwxUQkPt+O/DJTHMvCsB7Jq4sjGs1fkAvGvyj3es=; b=j7VlJPif5oSl6HC/K0RLIn3d9bLD27jp3m3Q2t5r0fXZQbyDzBDNtxhCj7FQA1qfgCVnQe NLLTEI7W3kKSxUT0Z8H54v6YdDTtSsbG60KVG+1W0oj01N2e314aWj9tgF/UXvVcFA61Of WyOELtiUB0f2hiGT7WD4pintwC1ksElm0UvUNbeWIL0Usfdl79FNd/xqiOEV/yIkAoDsrX VoLr4Xi4Kw+jyv/qVDvShfIU4//gPnUAdLBjR1QADZEqLp9EzLSTDPPHhJ8qCfq6h36rPn dLP8F0y4mSyFP1P/fmZXQihBFUPKfQxpzqNvO7g4YrcwbQHRr7IGe/IVRLNFhQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1671303331; 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: in-reply-to:in-reply-to:references:references; bh=xHpGwxUQkPt+O/DJTHMvCsB7Jq4sjGs1fkAvGvyj3es=; b=++oauI/vjD5HhCcozQswQY3375xy28qbOzvBC2ihkXjCG06gV4p1vvrKEzm6OlEsu4qlL7 bx+Ja/E5I+TgzwDQ== 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] mm: Convert __HAVE_ARCH_P..P_GET to the new style Cc: Linus Torvalds , "Peter Zijlstra (Intel)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: References: MIME-Version: 1.0 Message-ID: <167130333160.4906.12264497164941506856.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?1748375102229456833?= X-GMAIL-MSGID: =?utf-8?q?1752488701579400867?= The following commit has been merged into the x86/mm branch of tip: Commit-ID: 2dff2c359e829245bc3d80e42e296876d1f0cf8e Gitweb: https://git.kernel.org/tip/2dff2c359e829245bc3d80e42e296876d1f0cf8e Author: Peter Zijlstra AuthorDate: Tue, 01 Nov 2022 12:53:18 +01:00 Committer: Dave Hansen CommitterDate: Thu, 15 Dec 2022 10:37:27 -08:00 mm: Convert __HAVE_ARCH_P..P_GET to the new style Since __HAVE_ARCH_* style guards have been depricated in favour of defining the function name onto itself, convert pxxp_get(). Suggested-by: Linus Torvalds Signed-off-by: Peter Zijlstra (Intel) Link: https://lkml.kernel.org/r/Y2EUEBlQXNgaJgoI@hirez.programming.kicks-ass.net --- arch/powerpc/include/asm/nohash/32/pgtable.h | 2 +- include/linux/pgtable.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/include/asm/nohash/32/pgtable.h b/arch/powerpc/include/asm/nohash/32/pgtable.h index 0d40b33..cb1ac02 100644 --- a/arch/powerpc/include/asm/nohash/32/pgtable.h +++ b/arch/powerpc/include/asm/nohash/32/pgtable.h @@ -263,7 +263,7 @@ static inline pte_basic_t pte_update(struct mm_struct *mm, unsigned long addr, p } #ifdef CONFIG_PPC_16K_PAGES -#define __HAVE_ARCH_PTEP_GET +#define ptep_get ptep_get static inline pte_t ptep_get(pte_t *ptep) { pte_basic_t val = READ_ONCE(ptep->pte); diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h index 2334852..70e2a7e 100644 --- a/include/linux/pgtable.h +++ b/include/linux/pgtable.h @@ -291,14 +291,14 @@ static inline void ptep_clear(struct mm_struct *mm, unsigned long addr, ptep_get_and_clear(mm, addr, ptep); } -#ifndef __HAVE_ARCH_PTEP_GET +#ifndef ptep_get static inline pte_t ptep_get(pte_t *ptep) { return READ_ONCE(*ptep); } #endif -#ifndef __HAVE_ARCH_PMDP_GET +#ifndef pmdp_get static inline pmd_t pmdp_get(pmd_t *pmdp) { return READ_ONCE(*pmdp);