From patchwork Fri Jan 10 06:00:54 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Popple X-Patchwork-Id: 13933711 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6B3EE77188 for ; Fri, 10 Jan 2025 06:03:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5F0E36B009C; Fri, 10 Jan 2025 01:03:38 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 579646B00BD; Fri, 10 Jan 2025 01:03:38 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 32F3F6B00BE; Fri, 10 Jan 2025 01:03:38 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 0DD796B009C for ; Fri, 10 Jan 2025 01:03:38 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id B6E6B160885 for ; Fri, 10 Jan 2025 06:03:37 +0000 (UTC) X-FDA: 82990500474.24.DB1CD7F Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2085.outbound.protection.outlook.com [40.107.100.85]) by imf13.hostedemail.com (Postfix) with ESMTP id 0F15D20009 for ; Fri, 10 Jan 2025 06:03:34 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=OYnRCweQ; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf13.hostedemail.com: domain of apopple@nvidia.com designates 40.107.100.85 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1736489015; h=from:from:sender: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:dkim-signature; bh=ZCgMbF7x2UBpOxgDMd1b2b4SxJz7gCANr+Q4cTmNWOM=; b=zKICufTIgPDxQrjtKCR/+Xq4ekWLjWnYxgqE93VaghcHznqM2VNl/ZqEC/2xjampJ6PPbf EXxOAtjWyLbxXCEMedTtYh2HXxc8yQN/gk82XTHj+pF9jVdpPKt5ZdxUxjIeDa+CCoDMRE gYfyNeDs1nc6N+ItAhQ5NnFkGn1qb2g= ARC-Seal: i=2; s=arc-20220608; d=hostedemail.com; t=1736489015; a=rsa-sha256; cv=pass; b=1DprQdV4iFc0FND/Y8r0X91xSZO/z/Y3+6KZK7awypmM7b3gz/C52VvdaYqPCzHXf19DHP UbxhB3wuuvGqzTxA+jT826Q3b9ImKNjT6Tp58IYMWxweY3MK2TKBsyDzHKcWZFxZ8KJajY INLWgVjFsvpILpNsxc9TlBoyx1uf9kY= ARC-Authentication-Results: i=2; imf13.hostedemail.com; dkim=pass header.d=Nvidia.com header.s=selector2 header.b=OYnRCweQ; arc=pass ("microsoft.com:s=arcselector10001:i=1"); spf=pass (imf13.hostedemail.com: domain of apopple@nvidia.com designates 40.107.100.85 as permitted sender) smtp.mailfrom=apopple@nvidia.com; dmarc=pass (policy=reject) header.from=nvidia.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=H08DlGYp2qMUPZd44cK5N4ZS3uSSN9LnxcqOq5GoUeALmaJYIfVZ4goc0TJ7ID/qWOcJLzTe5uRQiOL9BqqeGn7RqfDrvm0eu8DR6vj5n4NBe97l1McbmCThpvRbIYdp3CDRCW0gpxWkYhWQbrHqsYtdkVZyYt9RJ/uPvtFLlwQTosU1F2P6MxY6uha9fn0Wr8C/VNgf6k3P45dnx9lEUpz+rKh3NiS+GqLS6dF+oFJfhiogSSPdCixRJdPszctnB0b1vntTBS9HlNaLUS/lYfcwfz+ycu0vVrgbwcAmxSXbVwTlx498AyFrmaXWzyb98DxPzvFMfsumLbnzcePM1A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=ZCgMbF7x2UBpOxgDMd1b2b4SxJz7gCANr+Q4cTmNWOM=; b=aYmpJWoY8CDs0+duKL8E50+e6Jef+Ou3Efq1S+p3XRhz3ySgbPuXFJklODlC/b06nseIhYsFG/oCnphazTu/tgHra2DcG5wc4j78zc6WJQ2ssalxHq77NT52HzOIuI98Yal55Cnzcdb1uZTPTDy+OKVSB0I2Pvp+OLzcU/+OqUEKu/PQBc2FMqgrGH3a17VmK3nUWf2J6nqt3hkDalq0puBTL73OzuWmlYgrklxvw2chKWQDt/lb5RPis0tM1UD2EL+PeJ5hTmQ1VBnrbjA1T7TnD9lSZN0AmeyLuBJnVHCQMqRQDBjupZ0AwAfTr4q1pqrR25LOYFD3LA711DMjlQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZCgMbF7x2UBpOxgDMd1b2b4SxJz7gCANr+Q4cTmNWOM=; b=OYnRCweQZX8DbnYCjWEUN/meQgyOZI8VORRTUUSkzGkyna6bSblsGgf/HsZUgnOTuRzIMp440+aM2OunClRsCbgrXX/HasAcK6/XRGC72fbqu0loNs96BdlX2Cm38JrNggQMnx6SMFINlBK+KaM0PoccSkUoJfJS8AMCqLyU5SyXUkKrAA2fOHlErz1KFcgcU1paZVyE379StsKYPOrri+ILJGN0OpmRM4/fdAoLB8WQ3XYMWMOc6+ryo6fLsjVRtO+V+RktnOk5uqpQLVj/S14pbTyXcE+7of2USq6Y1o7YDmkl2iExoH7HgXT3SVSUNFrZ7rZ/xBj3sxo+ln5s8w== Received: from DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) by IA1PR12MB6331.namprd12.prod.outlook.com (2603:10b6:208:3e3::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8335.11; Fri, 10 Jan 2025 06:03:32 +0000 Received: from DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe]) by DS0PR12MB7726.namprd12.prod.outlook.com ([fe80::953f:2f80:90c5:67fe%7]) with mapi id 15.20.8335.011; Fri, 10 Jan 2025 06:03:32 +0000 From: Alistair Popple To: akpm@linux-foundation.org, dan.j.williams@intel.com, linux-mm@kvack.org Cc: alison.schofield@intel.com, Alistair Popple , lina@asahilina.net, zhang.lyra@gmail.com, gerald.schaefer@linux.ibm.com, vishal.l.verma@intel.com, dave.jiang@intel.com, logang@deltatee.com, bhelgaas@google.com, jack@suse.cz, jgg@ziepe.ca, catalin.marinas@arm.com, will@kernel.org, mpe@ellerman.id.au, npiggin@gmail.com, dave.hansen@linux.intel.com, ira.weiny@intel.com, willy@infradead.org, djwong@kernel.org, tytso@mit.edu, linmiaohe@huawei.com, david@redhat.com, peterx@redhat.com, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, nvdimm@lists.linux.dev, linux-cxl@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, jhubbard@nvidia.com, hch@lst.de, david@fromorbit.com, chenhuacai@kernel.org, kernel@xen0n.name, loongarch@lists.linux.dev Subject: [PATCH v6 26/26] Revert "LoongArch: Add ARCH_HAS_PTE_DEVMAP support" Date: Fri, 10 Jan 2025 17:00:54 +1100 Message-ID: <8dbcf7eecf7d0aaa032df5cc62815269ddcf198e.1736488799.git-series.apopple@nvidia.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: X-ClientProxiedBy: SY5PR01CA0075.ausprd01.prod.outlook.com (2603:10c6:10:1f4::11) To DS0PR12MB7726.namprd12.prod.outlook.com (2603:10b6:8:130::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DS0PR12MB7726:EE_|IA1PR12MB6331:EE_ X-MS-Office365-Filtering-Correlation-Id: e9455f33-2f6e-488f-f672-08dd313c830b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|376014|7416014|1800799024; X-Microsoft-Antispam-Message-Info: HZMaIfFZrz+inBpQytpPLK4CZ42j+6E1dkhkPF26PuKNkD2QgwjOMl7g3Sh74q7mUDKx/Q0mxn3AUUmTloQssXieNf2NQd6sLKgZO3YkMc4v5Qqz4UAS/dbOXDIQZp3LPJ5bbsFAN7ktMv8+i1BOL9t7vtS9SiXfXxAts0kZwGDuT4wCjbKdIOGZJO9K2FgQhuYbBAFgHm5Kntcs9TvUKEeTDJcjcHJL9+ZGDICY+ZtR/M3At1YbikMf8ApETlCviUfb2bZ2lLkredOhJFUVDSxWxiWcW8ijrmN5+8FRKwwn3/mHHh3XqPcJtohXCGQoqbWwfzDlAPoFwR/7b5wGdRAaJ0mUinxMSVE/BPiETbsnpjg8xuRDr2MNWuOnVLLxGGAXQDdgPQiDFz+Rmycj63Ihzf2+/lbvrkiHOgz8FADL+dzG/jYJ8D6zojq8UEAtAogTq6hg23gQdNQviBdPDLxt4dIqptEm9Nl00yvOWlh3pwJijeBskjSnUh+kbnvMJKabX/yFaktWUlW6l4qZhjaD5yV8hLeXA03kPBxh/hduj/AcO9c6bCRd8FmzpSivKdzQnT9Axnla4acIJUZZ7BNAGixoh+Tuc7975G8HL1jsuBH1/09MqPKQyF4BWe1DrHeVBM4+VGFP0J2ZBdSSsv9b+uv2RzdSAjxU6rvsB/AF8rQW42Xpr88y8tLpyoOTj2pzqAZhtmlm2yEshXcfqppk82YZ1v2asBBMIiI8W7GvDrAu5LGy38i/LtSvV+hG3nGyltKeF8A3PJEHiacdhNZVYHnXmPwBpmh63DWu7CyEQzftJH5Ntmhoc1n1E3uKEzd/fxNDs84wDpzLVgFYRhxUioZwZPNBm1Py8bFOdThFmxt2O9qXzkYgmbHevDcZ80S0vwPXeN3nbfXfNOx0EBPO6jaoZZXDuoN6NrPkQFEkMPprQokq9vqlpZsaCBcwy9QOBQ2Pc1CPvR3LMQMK8V81wno6ARr49/6yVHxPqOmKWmEl6fWsp4Xi9x5nwplvRfOrHJ1yfRFgD6MSTXWLJCOb7YenDC5DsxcTLu5guwTWHu0AQHFWC5gM3xlB3+UY575snHXXoMvK4ZF2PMjVEwTWzzyUEWaLgEYDOYteTGKUNoD5rZK7xBxcwSFXUVgU5Ga5riABUHC0ROTmTrwPErVUqCzeRtvQOR0mkPcs8/nCI/81v4UqSbj0GoOY3D61NZHcpyttk164LIaSVBnr2rB/UcInyl1nMboHsllLOWs7IxVgsXLci1EocseMg2l8cngw6rUA5R2UeDcIyYx8mCRnh18e/XrdekiYrmQxgkicTyR7En0dnNoT32hAzNVi5tsv6ZdmrdywToDrvBYAL74pnzRMpWfCkADNS/zcotZUM/OKWLa386KMnmTKng82 X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS0PR12MB7726.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(366016)(376014)(7416014)(1800799024);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: qwhOVcHQFD5C28eaM6HLxru/5MTVmEtsZ1ZU3ztIadeXuwm4GZwvmdwtZQBzgD/ZSOzfUeIZ2KwYLt8h77QP+4n7pNrGy1DefR/jT4TZeGaebfVwSYw3RI3njIK4U6o+F6cEsZuqhG/+UkdmOlznhrT/FaO4Jw36pJmXepDaRwKUoJC6dy175OREDxMBTLKNPaAL+wwV7T7T5Xy11hMU9FaChlaR2OGGXgy6SFzj6eD7b3CqJ5Kp5jq2nZ6NW6HfbV7gLfvJUZMm2RfZ7MlzUSLqXm4h4XPinoPGOxDN/blDnOfuc3386fO2LhjxywKVZAozM0SQOUU6sxOENbNNZfcMP5BgYqRADuMmAv21sSKxK4EglAOKhhWTclcGAYUP7wYTwJU9CfYL3Iu0CCnUkqSIrNOAMhXKe9dqL17EzgEUdP8AIKFwpTiRJ9vInCzY4DfFs3t4FkFkZ4jObLwjmSslZHnLqhfuCOPL2Hfk1SRVcg4YN0xorVNCLFi5bAyt8DMm+gTPDgetIvN3gcq7SCj+hGYI42X+7DrSAd2HPspyF2VUJS9NQQCSfs4jEGLasZrkDtkBJ20DI+DNjkxAIaVYqJr3bBUE5S0/IQJpFiul5BggIKhk23t/wExsarq+c2ZSI8QCb3wrVVMNcT4+x5bU9pi2RPU7UZ/lTts5xVgFKn+jrFxwr+BjRLfOQZtLbNwcS0Y0epR134c631diTzVfmPbiB4juEXoGTY4kYPot/NgpEZnouIz9FVvy6qM9hvrrKgBKq1x9rzQF4+xR7tz3bx228YsY9HhtrGRXYyngICQM9MgGfo8JbyKq0pKWa61u4WeCGIKgYmp7z3IRG+sSwskXTt4wvGfQ3sd/6eKCa8mM/orJ5mKEnOyu1VlReXqkgmPJsFboeJ3f7Ao5+UV15z4mveImwgVc34vGs00OOlbyEkqtW1EqCfKjak5dJrZ1/Tn/Db8tl9BZkhOlu9uZKDKKDmoOkO2yB7vtkIazXD3EASUlzZuvaCYGlzDgKghBtban6Js3kA2jyh6142F3jozzpFDdCnJkTV31kbsiGW1alXFG4KDnV72TynAVJN1ZqsirU9CbHLGGjB9OE06X3iKJZzT8NZtf5qslw/kPgJ3Vwj1TF1sPwKe2CqsZ3F2DEVZiZkMrtD4SiYbjl6cGmHZlUG+uNS3Qct/Ps6q2i4WAfQYI9wDWW4eewvdW4FcTYFYN8Yq3dtRvOFxq8RL0xX/4eCT5CbutwGACBak/XZqyVfwqHEKMySrRROn0kYLc9/uOnJQl0E2DM2IsBZdLlE0sMvJXmJTb+HZdxBrjKXdm9iyuxgOFXsy9JFk6x8f9OKfzvj/CmYtWIjFOCcswtkQ5opfbU3ytZpeLnU4UONd2YnaxKE8+0r7CQwLherb82xjO5cuWtFIdeDdKQ9cL6GgDhVH3W89Hxpaf+YTqSnOHmpWZtOmE2FnkmHxHtAktZGdlWJ9M5KzRCjZikHgfi0WH66+Xa9p/DCCExoFsCQizYEMogslaKD2Tr4k3lrW+gk78y1C1qnb1kRDGEeUP0ODTWz4nVxmmScs0j7GQO1ipGGW5mRRjWbp66aaq X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: e9455f33-2f6e-488f-f672-08dd313c830b X-MS-Exchange-CrossTenant-AuthSource: DS0PR12MB7726.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2025 06:03:32.5973 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: GVUEqa3IwuoHR6886tgFc+Mr7PUWZ+Y1jyRqL20KEf4HRPgc+03/Zn4LJezJ+n1UNVNkXru86coBEYlAYSUlXw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6331 X-Rspamd-Queue-Id: 0F15D20009 X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: wbtbaexw6h7nm5df68wixxt51kue6f6x X-HE-Tag: 1736489014-85779 X-HE-Meta: U2FsdGVkX1/qxBAlUrk6r7wH8gqX+6oLSUR6RWFnJXGfaLV68Er3mElB+VJ2lutINqMamukBtXqah/cU8eQG6UPdfw2EXAm7n6wimKeeLPb/3AqTJPejYYEMNw6njeDGmP2b091+9YxuScQo7g82HRQ6enxurPIEnrMbR0FCUQid/FFEZ/42r/8IO6prPRjduobNKRnNDXMjahdaTNdNhCTGe/Zmv+TiaKPBG43F/NkGGKfGVnwzSgiuP1VV5poVPrkvSO3VPog0yNz6oFr72uj3gQNdtedkRh8lUY2r0jr0r/na4+0c6hIGBYl4qV4snwZW6JCLhkUkBT6dR8d3J19S8T/TdAKQK2yIKCGmKDnM1g3qfhGt6BztTs06dNlFOWv54u8XF/9v7GQak5gmcPLRmEoVMI0Z0wsPw1O5znNBIb4GM4jL/wQLAB1ts174R7zaOGPvyU15TSQIFVd6XXh9uBiKfvguo55mzyo/LsaYvmctvxcJSHqspNRWEfbt7QRcpKAIPtqxUwWBE7TI+azy8eIMNwNXKI09qG2chjLXx8SeJ+3ar924ap5xQI6pxdMnWAZOUNS5TsEcQe3U3b6ItCvvvymhGbdRSvENx+vHLjD+XhUqwLyz8bDdGg6htaoE+AGh/xUcacYUogCbwwJvrdPXWCR5FNMozcymG8XAQsg0ZcbzMAxjlLBp8LWrfZHWC5bnMu0Hk0WMu6W4DiJnm4oarBqoImQuk2dnE1C7mjKeCmvsabiBS+hL1jSmHjqwsDj3mlyQzdm9ZwnLMnKjr5wEGS256O7HJWgY8IoCBHo8VPWmnG60UoT71f9lnAVCqRlbuy9cWZvXP1nkYxSDl9c5E282teftK1V4RP0t60TxrpFKfSyGf68LMCquOorz7jgElSkH56NGr3WvKHXpMJqCJbHCxbqDtg3me1Y2fnf+7hrRY1eToOpsVmGaI9yjMvqRKR0mM+6yyf4 dYkfopge m5LhijUnyHre7E6fxSar05GOvPtZM9yqejHhLzpwtV4Cve3afm3i6DAWqqgbGGWzRfnVtuPwRR29Yg0E1FNhx3dSBsS3XnFAVYNEU+30/3XVE23aO/e7ADI4IdiOXZIYYxjjPNnNyewXx1Vcgd+NdlppXYMlu2N8TMdPfgS781NGncAyz2oPUIFJpYhjKVnpvaOEhkVBuI0cnQ/7da7FLoY3tQL5gOTiqUqjHIi0cqJz2B1a8TpyPkG3NssS+9qyZDwScrK154HhtxXa970HoI0g83Kefl7rkfw6h4qT8ce995sZk1BXU3bHzBUD6XaRUOLfiPGnLNH6Mk3tWrMdBEL2ahHUTEkwkbEM8rzVnal5CpEUR2mUqmRRA4FerwiFVlVBaWfseTKtI2V9cgLnQJ93JCVnBQUuhNXBCjso1/zFYh5BsoNcWJAazI2B0KA34bmSnRhFe7PGB2K5M+Hk3wzQqjg== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: DEVMAP PTEs are no longer required to support ZONE_DEVICE so remove them. Signed-off-by: Alistair Popple --- arch/loongarch/Kconfig | 1 - arch/loongarch/include/asm/pgtable-bits.h | 6 ++---- arch/loongarch/include/asm/pgtable.h | 19 ------------------- 3 files changed, 2 insertions(+), 24 deletions(-) diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig index 1c4d13a..b7fc27f 100644 --- a/arch/loongarch/Kconfig +++ b/arch/loongarch/Kconfig @@ -25,7 +25,6 @@ config LOONGARCH select ARCH_HAS_NMI_SAFE_THIS_CPU_OPS select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE select ARCH_HAS_PREEMPT_LAZY - select ARCH_HAS_PTE_DEVMAP select ARCH_HAS_PTE_SPECIAL select ARCH_HAS_SET_MEMORY select ARCH_HAS_SET_DIRECT_MAP diff --git a/arch/loongarch/include/asm/pgtable-bits.h b/arch/loongarch/include/asm/pgtable-bits.h index 82cd3a9..21319c1 100644 --- a/arch/loongarch/include/asm/pgtable-bits.h +++ b/arch/loongarch/include/asm/pgtable-bits.h @@ -22,7 +22,6 @@ #define _PAGE_PFN_SHIFT 12 #define _PAGE_SWP_EXCLUSIVE_SHIFT 23 #define _PAGE_PFN_END_SHIFT 48 -#define _PAGE_DEVMAP_SHIFT 59 #define _PAGE_PRESENT_INVALID_SHIFT 60 #define _PAGE_NO_READ_SHIFT 61 #define _PAGE_NO_EXEC_SHIFT 62 @@ -36,7 +35,6 @@ #define _PAGE_MODIFIED (_ULCAST_(1) << _PAGE_MODIFIED_SHIFT) #define _PAGE_PROTNONE (_ULCAST_(1) << _PAGE_PROTNONE_SHIFT) #define _PAGE_SPECIAL (_ULCAST_(1) << _PAGE_SPECIAL_SHIFT) -#define _PAGE_DEVMAP (_ULCAST_(1) << _PAGE_DEVMAP_SHIFT) /* We borrow bit 23 to store the exclusive marker in swap PTEs. */ #define _PAGE_SWP_EXCLUSIVE (_ULCAST_(1) << _PAGE_SWP_EXCLUSIVE_SHIFT) @@ -76,8 +74,8 @@ #define __READABLE (_PAGE_VALID) #define __WRITEABLE (_PAGE_DIRTY | _PAGE_WRITE) -#define _PAGE_CHG_MASK (_PAGE_MODIFIED | _PAGE_SPECIAL | _PAGE_DEVMAP | _PFN_MASK | _CACHE_MASK | _PAGE_PLV) -#define _HPAGE_CHG_MASK (_PAGE_MODIFIED | _PAGE_SPECIAL | _PAGE_DEVMAP | _PFN_MASK | _CACHE_MASK | _PAGE_PLV | _PAGE_HUGE) +#define _PAGE_CHG_MASK (_PAGE_MODIFIED | _PAGE_SPECIAL | _PFN_MASK | _CACHE_MASK | _PAGE_PLV) +#define _HPAGE_CHG_MASK (_PAGE_MODIFIED | _PAGE_SPECIAL | _PFN_MASK | _CACHE_MASK | _PAGE_PLV | _PAGE_HUGE) #define PAGE_NONE __pgprot(_PAGE_PROTNONE | _PAGE_NO_READ | \ _PAGE_USER | _CACHE_CC) diff --git a/arch/loongarch/include/asm/pgtable.h b/arch/loongarch/include/asm/pgtable.h index da34673..d83b14b 100644 --- a/arch/loongarch/include/asm/pgtable.h +++ b/arch/loongarch/include/asm/pgtable.h @@ -410,9 +410,6 @@ static inline int pte_special(pte_t pte) { return pte_val(pte) & _PAGE_SPECIAL; static inline pte_t pte_mkspecial(pte_t pte) { pte_val(pte) |= _PAGE_SPECIAL; return pte; } #endif /* CONFIG_ARCH_HAS_PTE_SPECIAL */ -static inline int pte_devmap(pte_t pte) { return !!(pte_val(pte) & _PAGE_DEVMAP); } -static inline pte_t pte_mkdevmap(pte_t pte) { pte_val(pte) |= _PAGE_DEVMAP; return pte; } - #define pte_accessible pte_accessible static inline unsigned long pte_accessible(struct mm_struct *mm, pte_t a) { @@ -547,17 +544,6 @@ static inline pmd_t pmd_mkyoung(pmd_t pmd) return pmd; } -static inline int pmd_devmap(pmd_t pmd) -{ - return !!(pmd_val(pmd) & _PAGE_DEVMAP); -} - -static inline pmd_t pmd_mkdevmap(pmd_t pmd) -{ - pmd_val(pmd) |= _PAGE_DEVMAP; - return pmd; -} - static inline struct page *pmd_page(pmd_t pmd) { if (pmd_trans_huge(pmd)) @@ -613,11 +599,6 @@ static inline long pmd_protnone(pmd_t pmd) #define pmd_leaf(pmd) ((pmd_val(pmd) & _PAGE_HUGE) != 0) #define pud_leaf(pud) ((pud_val(pud) & _PAGE_HUGE) != 0) -#ifdef CONFIG_TRANSPARENT_HUGEPAGE -#define pud_devmap(pud) (0) -#define pgd_devmap(pgd) (0) -#endif /* CONFIG_TRANSPARENT_HUGEPAGE */ - /* * We provide our own get_unmapped area to cope with the virtual aliasing * constraints placed on us by the cache architecture.