From patchwork Mon Jan 31 08:16:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christophe Leroy X-Patchwork-Id: 1586567 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4JnLX64Xqwz9s8q for ; Mon, 31 Jan 2022 19:17:25 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4JnLX32pF0z3bNg for ; Mon, 31 Jan 2022 19:17:23 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=csgroup.eu (client-ip=2a01:111:f400:7e19::62e; helo=fra01-mr2-obe.outbound.protection.outlook.com; envelope-from=christophe.leroy@csgroup.eu; receiver=) Received: from FRA01-MR2-obe.outbound.protection.outlook.com (mail-mr2fra01on062e.outbound.protection.outlook.com [IPv6:2a01:111:f400:7e19::62e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4JnLWs2DdXz2xt0 for ; Mon, 31 Jan 2022 19:17:10 +1100 (AEDT) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZM3Jh05/2VqzB40drhgRdzdeHZ705RRTq5bmLemJLgD6BKLtzYFlGDyPRq9pAw/ht3vTsyOMYWWTkEWk9fjLTLErE++faXN87i0mSOWcGyOm7IFuFTQ6SPWDYSfcNKDOcme4L6P/Rlrcs7BGjMS4vkqrWG4YtbBpnYUCs10c+BGyU0YKubefxU8IfzqeULC7A+GDl/Tu5ipVVU/vvvhnr0r8dw4obbE8oQwN/R/qdH11XBocK6RjqmNjqJxzcZ2dN6gY/O6zfaNWtd/SLyMOv64vTfzMmTtNn6ZUi+IxS/Fypv5QVRxEd6FcMdECu4+MSdK/fZV8HXKiMsrFIe/UvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=YWQqgnxvqI3lL7g5C8plmPGDH7WaxydCkFOX8gKIU5o=; b=kPsgXnY6LYioT1PpgOz7PNZ/uVPcvJeRAuE+Y9lo3t9EBsJj8rmY3bCpgWou9q/T862xUQfOI4IcA5EFJWtOweKRxbA6uZDx3hHacGkgORblLBDCyAiI3q1pS7ZSKhhs37lwVaZtB2kghQQmyJ7ipQlXS3Rh5HT1sHcmvWZhk1pLO3f1n0CtFI9Swm9oQxGeVUZpPxZ15b4rUzVg1xeReWrLDpjz94/Kc69tryU2cffRsTTGXEYqRIEDH0f6sPE821qFlradh2kNT4G9KiQuna2J4QbAEnHneOVcRNxJD3KdB0dBzlzs0tFIFp83mLg6SNWEiIko6h+C4Cd5C7nApA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:31::15) by MR1P264MB3842.FRAP264.PROD.OUTLOOK.COM (2603:10a6:501:24::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4930.15; Mon, 31 Jan 2022 08:16:48 +0000 Received: from MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::c9a2:1db0:5469:54e1]) by MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM ([fe80::c9a2:1db0:5469:54e1%6]) with mapi id 15.20.4930.020; Mon, 31 Jan 2022 08:16:48 +0000 From: Christophe Leroy To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Subject: [PATCH] powerpc/nohash: Remove pte_same() Thread-Topic: [PATCH] powerpc/nohash: Remove pte_same() Thread-Index: AQHYFnrkkg2ktYQR+kCVvQTrvN3q6w== Date: Mon, 31 Jan 2022 08:16:48 +0000 Message-ID: <83c97bd58a3596ef1b0ff28b1e41fd492d005520.1643616989.git.christophe.leroy@csgroup.eu> Accept-Language: fr-FR, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=csgroup.eu; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 2c2a4cc3-e9e3-4e13-305b-08d9e492072e x-ms-traffictypediagnostic: MR1P264MB3842:EE_ x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1751; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: m0xjmebowYlF7eS/OkpyZwdnPIQwik0o9U0g2ujhK3cuKPw9nCLAlMA4IYfGbmrZocLOZAAsZV4mzewvT7Nf04KhDrAz5fYqKe/2Evq3YUhYqEjYrrX03/6zbn05zRL23DZ32cTNM/cJneHWSqAbJAMQCYVLVq9ayj0k/0Vp0FDS/gS6dX9VXcqV13RJPZqho9VmxcCWS+WFXSys8QgGqo+hJyrE4cOuy3wFe27r5RRWbP6vXvHPuxj+riGbbFhjoOHqxWDmyaVwusdo8l06hv+GL8/zhdVE+lmEfwSZKFf8bb18opn9y56Rc7OT3/rVl5uR5A4BZYKtm7cNsXqGTr2YzQ48lwxr5DTTX3/YvhYxKboxfxF0hOyNcUf08ppD+E0fQhsaceBydH5X6FIRqocRLOOWDAWzd2THWCJnZmV5rmprPsw/7veL7tRzWZQ+CrC8oNxcQ4RpQrkaWAMIb9OSIlVpabpeE86tw1ckLbK5xPziEAyn+JgYWO06y/TjXWDCGPgJdCjMrMKUlvghaxgCNEQ6Eui0mrC+WF6L97gCkAFVcVMjhW4H0jNdAtYVkC2Jo35SZu91bMCyFCIT088BsQTrYlWE/autcfzr8lttJGw3Sf4AhoHOR5x7lMXwrbJOdz0yygcaljptK0AUdrq/RiqCGwI0Y9sYJTC87RAs6HC027pCg/rnfAlOR2LQ+5CQ4cebA1StomxgYpvZ5Q== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230001)(4636009)(366004)(110136005)(44832011)(6512007)(54906003)(316002)(5660300002)(508600001)(186003)(86362001)(26005)(2616005)(2906002)(83380400001)(6486002)(4326008)(36756003)(38070700005)(64756008)(66556008)(66476007)(66446008)(76116006)(8936002)(8676002)(66946007)(71200400001)(91956017)(6506007)(122000001)(38100700002)(20210929001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?iso-8859-1?q?6V73n1sq5BNCirj9LEDxKHv?= =?iso-8859-1?q?PT7wLCC7VQxGwCs1atXo9ajyhtahgnnuK61L/lPezMe76IRCYk8pA/lpJRAf?= =?iso-8859-1?q?nGKPbjOznZQhciktBEq9aIt2nrqGhnyYpotfeSKV1NkDNPiNDmZFpeIStefL?= =?iso-8859-1?q?xAy0jcMhbiyk8pZDS1sQozOb0CivdDCkT25llW6KP5U+GI2dY8fJgYwEuqpo?= =?iso-8859-1?q?UlIJ8c+HFU77sCD7EhqDbMIhTIg/FaQ/DnFWeHhBlI5uMYNGv+uiCG/B2b+V?= =?iso-8859-1?q?OpahOSiSuqJu1L0uds/5MOsyinYS9LArVXqPF+KyteP1ab8iZcB4pzh6Qw70?= =?iso-8859-1?q?i60JKpbfqBe33ldlQ4S+d9QO+6eCu2NsLtbFOmDJEdPmeXhSRH20k9k14Dwk?= =?iso-8859-1?q?og+dwAHYtpqlg1jvHAgLnkx7It+6KoPf+0GY6itWFzr0UVFNgEXWoSwXP3QI?= =?iso-8859-1?q?HM/wu/FlJBM4ty+N7Y2W8UhN2jMg+ecWKUR3b7KQOs0kapzloWUWAwY4L4j6?= =?iso-8859-1?q?BDAee39LNXyzwU/+Dxb3xSmiXJt11iWLou5qdDiZz00OrGA0f1DfL/aNAt/K?= =?iso-8859-1?q?4TdqE2FTugow3ZVb5bNL4DC7kuil+xRBYre5kdbRpqZsgE3Jc59AeFEBzCLE?= =?iso-8859-1?q?QLRwLIrTjodBEwn3GEthqyfkrKS2yoXuAFDSg2pJRubYNWIq/7dw1Tpg0/Db?= =?iso-8859-1?q?YKcRaRnoHKLeVCu27MBN4CiO0FY2wz3B4cQN5aWKd+f1bpBeG3AvBtuS4zos?= =?iso-8859-1?q?+V3N3TJl4+dw0PbUCawotcQGui0EqRJSK2K9Zfg4E8ofXryIUhPnd1Y/OG2x?= =?iso-8859-1?q?9SCKS1/5onTD7gZ5tSe/wy1kz6xVqZSEH7GqhQLg8sNyETOBPUt7lvAJM4vd?= =?iso-8859-1?q?mn85s4ZYJo7MdNjPH1JEJ7tMjCBzsGPFmOTCO3Jl4Jw2R9zj72dBrF2gXO66?= =?iso-8859-1?q?LL+x+5QvubPpxk7/QF0x93wt2+CgU8ie587+5BMLW/nxwOST/xtOYFijem7j?= =?iso-8859-1?q?mi5lfBpQPCTIHUn4aIkSKDui0QeY40w3Q/4QH0J/yL5KyWi1pkel8Mkkut68?= =?iso-8859-1?q?Qc5xnmvy+InY5HLSy/bzO5K6PuinJpgraeu1jfQnaLra31mWJrFpTQQFyESN?= =?iso-8859-1?q?nYJOr4IzhTO6mdxGPtxXgLL7n6VPzq6pShoh9e2BhhxSqkbYPryXfa8IQrB9?= =?iso-8859-1?q?MpZicbnap728splR1eefxKxYHRydSISGkTpbeUgsQk74nFlfM6wEhhPa5oY1?= =?iso-8859-1?q?Pr8S6tcGVKJEF6+VXjBrWoYH22OCrkFwIuA5Ojc/IVUOx8irhjYJE6n/3bGN?= =?iso-8859-1?q?zBZtzWtSJydhp2Bhit/1DrtXuk16yYmTYAnyJdlI8m52nCNzac0Dw85zI2B4?= =?iso-8859-1?q?tnUIt6M0VxMg1cdXT+/YijUeuNSKyO3jbgPHan+e487OGNdJ3qx7ODylxUt9?= =?iso-8859-1?q?oLlxJyUSPAlpEKFYBEjn0Jd8pvpoVkbH9tXeVujjFPQwQrolTUBlVAEIVxHa?= =?iso-8859-1?q?ImDXnYzHmW2oVmv6161PR3QEcbtbWF9MMHsh74V9W6TL1i0ZQ06dvm9VeVYH?= =?iso-8859-1?q?VkOvvL/YFRrzIGXa05QVunJ4ulGSny3nOLcCYYDYlfWExwWXo/yto8ZCyc21?= =?iso-8859-1?q?bwSTtRjFzuGkyG9nUC5W530jwnKS3/KdvtbLwE//raq8rTf/S0VGMofHkc9b?= =?iso-8859-1?q?oMAFtuOzDh6qWPA9vP7eDURmSMC/Nq9ytb14O7ROgD89jP+TuRNsEQ/LrDVP?= =?iso-8859-1?q?seHI=3D?= MIME-Version: 1.0 X-OriginatorOrg: csgroup.eu X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: MRZP264MB2988.FRAP264.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 2c2a4cc3-e9e3-4e13-305b-08d9e492072e X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Jan 2022 08:16:48.5836 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 9914def7-b676-4fda-8815-5d49fb3b45c8 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: gQOWEuB6oH13R10vZS5zM1wKdoyEsFMGpSLdUCP4Gg03Xmct53jyg/rv5pAqou/vYH+zBq099JRANDjqvGH9vtIZG8LZb4gh7QLIeTbofig= X-MS-Exchange-Transport-CrossTenantHeadersStamped: MR1P264MB3842 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "linuxppc-dev@lists.ozlabs.org" , "linux-kernel@vger.kernel.org" Errors-To: linuxppc-dev-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" arch/powerpc/include/asm/nohash/{32/64}/pgtable.h has #define __HAVE_ARCH_PTE_SAME #define pte_same(A,B) ((pte_val(A) ^ pte_val(B)) == 0) include/linux/pgtable.h has #ifndef __HAVE_ARCH_PTE_SAME static inline int pte_same(pte_t pte_a, pte_t pte_b) { return pte_val(pte_a) == pte_val(pte_b); } #endif Remove the powerpc version which is similar to the generic one. Signed-off-by: Christophe Leroy --- arch/powerpc/include/asm/nohash/32/pgtable.h | 3 --- arch/powerpc/include/asm/nohash/64/pgtable.h | 3 --- 2 files changed, 6 deletions(-) diff --git a/arch/powerpc/include/asm/nohash/32/pgtable.h b/arch/powerpc/include/asm/nohash/32/pgtable.h index d959c2a73fbf..a0525765c7bb 100644 --- a/arch/powerpc/include/asm/nohash/32/pgtable.h +++ b/arch/powerpc/include/asm/nohash/32/pgtable.h @@ -338,9 +338,6 @@ static inline int pte_young(pte_t pte) return pte_val(pte) & _PAGE_ACCESSED; } -#define __HAVE_ARCH_PTE_SAME -#define pte_same(A,B) ((pte_val(A) ^ pte_val(B)) == 0) - /* * Note that on Book E processors, the pmd contains the kernel virtual * (lowmem) address of the pte page. The physical address is less useful diff --git a/arch/powerpc/include/asm/nohash/64/pgtable.h b/arch/powerpc/include/asm/nohash/64/pgtable.h index 2816d158280a..a441056b3eba 100644 --- a/arch/powerpc/include/asm/nohash/64/pgtable.h +++ b/arch/powerpc/include/asm/nohash/64/pgtable.h @@ -281,9 +281,6 @@ static inline void __ptep_set_access_flags(struct vm_area_struct *vma, flush_tlb_page(vma, address); } -#define __HAVE_ARCH_PTE_SAME -#define pte_same(A,B) ((pte_val(A) ^ pte_val(B)) == 0) - #define pte_ERROR(e) \ pr_err("%s:%d: bad pte %08lx.\n", __FILE__, __LINE__, pte_val(e)) #define pmd_ERROR(e) \