From patchwork Wed Mar 21 04:47:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 132178 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp1696489ljb; Tue, 20 Mar 2018 21:50:13 -0700 (PDT) X-Google-Smtp-Source: AG47ELs6mYXeMqw6pxyraD0qnRcwd0li637MdGgSVyqXtsTU3PrUwo0UmanYXpqZS+9TGdqqVj2S X-Received: by 10.107.148.212 with SMTP id w203mr19706005iod.305.1521607812915; Tue, 20 Mar 2018 21:50:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521607812; cv=none; d=google.com; s=arc-20160816; b=wODCThECG8i9fspFU9NVM73thdwHM3BIOfs53lQaT9Hp15j08K0qnHeb4YAzxDpfYF 1WyRk5qMjr1y8l1tx8Ho5ODoav5aj44hapokhmKNp5eaIhieeble8O0BOfnM2cn1u0qs TceMFP3GQv46YRnGKiIZvpaiMHgi0YkH6vA3c7AUgW49wIp6U6tbn/MgCKdtS7ypikMW C13q8PhNvpIgw2zIoT5GYneG9tnRwx2wzZeSqmnDhvh3qr/CxsivqqIrhGBh9BtrmyeU zaazboJbjTp3EWiFegoEQibX1+528N7CG/tSYG/TGtllEZ77APCCJy4sUHwz5uHOF0Zx MCkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:references:in-reply-to:message-id:date:to:from :arc-authentication-results; bh=h7VdH78qZwbzN7LmTeI4BkyQqNzEFfLL2J4zrpUBLos=; b=vj8R6hUp/pIAdzcmXZ2PNtdfFsPymj8tnm0MK+WJ/jzj5yT63WBk/dymaQXYIGFDyj 8+ZwzjU1JDOX/roO63SuwxvvAtT0JEGozZAwHgwsrQ0Z/w3S6H8EqmAiaE50Wr5RuBnu W21L11+r0HPBq+8jc/+iheH0zyNNATEFCJb8MocUsrk775qLhB1LCadVuo6kJ6C6R+M9 sXIuEgJi8B6f4sAwTvswGiV5wNkQkmNmMLlk7NrcTbvwBh4r10PMq1OVXK7q4FwPOWdX TFBkxqbHcnn4XDINsRyNJl3vl0HrBWZ/0oqCkw5764GvrAUiJNWGIP8YUgmxlfReIUdU 0dBA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id 96si2499937ior.272.2018.03.20.21.50.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 20 Mar 2018 21:50:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1eyVfO-0006o4-6k; Wed, 21 Mar 2018 04:48:02 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1eyVfM-0006nf-OT for xen-devel@lists.xen.org; Wed, 21 Mar 2018 04:48:00 +0000 X-Inumbo-ID: 18333289-2cc3-11e8-8248-2fda3a446a53 Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas1.inumbo.com (Halon) with ESMTP id 18333289-2cc3-11e8-8248-2fda3a446a53; Wed, 21 Mar 2018 04:48:27 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2D40380D; Tue, 20 Mar 2018 21:47:59 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.206.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id F07C33F487; Tue, 20 Mar 2018 21:47:57 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 21 Mar 2018 04:47:27 +0000 Message-Id: <20180321044737.20794-7-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180321044737.20794-1-julien.grall@arm.com> References: <20180321044737.20794-1-julien.grall@arm.com> Subject: [Xen-devel] [for-4.11][PATCH v6 06/16] xen/x86: Remove unused override of page_to_mfn/mfn_to_page X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: George Dunlap , Andrew Cooper , Julien Grall , George Dunlap , Jan Beulich MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" A few files override page_to_mfn/mfn_to_page but actually never use those macros. So drop them. Signed-off-by: Julien Grall Acked-by: George Dunlap Acked-by: Jan Beulich --- Cc: George Dunlap Cc: Jan Beulich Cc: Andrew Cooper Changes in v5: - Add George and Jan's acked-by Changes in v4: - Patch added --- xen/arch/x86/mm/hap/nested_hap.c | 3 --- xen/arch/x86/mm/p2m-pt.c | 6 ------ xen/arch/x86/pv/iret.c | 6 ------ xen/arch/x86/pv/mm.c | 6 ------ xen/arch/x86/pv/traps.c | 6 ------ 5 files changed, 27 deletions(-) diff --git a/xen/arch/x86/mm/hap/nested_hap.c b/xen/arch/x86/mm/hap/nested_hap.c index 4603ceced4..d2a07a5c79 100644 --- a/xen/arch/x86/mm/hap/nested_hap.c +++ b/xen/arch/x86/mm/hap/nested_hap.c @@ -70,9 +70,6 @@ /********************************************/ /* NESTED VIRT P2M FUNCTIONS */ /********************************************/ -/* Override macros from asm/page.h to make them work with mfn_t */ -#undef page_to_mfn -#define page_to_mfn(_pg) _mfn(__page_to_mfn(_pg)) void nestedp2m_write_p2m_entry(struct p2m_domain *p2m, unsigned long gfn, diff --git a/xen/arch/x86/mm/p2m-pt.c b/xen/arch/x86/mm/p2m-pt.c index 753124bdcd..b8c5d2ed26 100644 --- a/xen/arch/x86/mm/p2m-pt.c +++ b/xen/arch/x86/mm/p2m-pt.c @@ -39,12 +39,6 @@ #include "mm-locks.h" -/* Override macros from asm/page.h to make them work with mfn_t */ -#undef mfn_to_page -#define mfn_to_page(_m) __mfn_to_page(mfn_x(_m)) -#undef page_to_mfn -#define page_to_mfn(_pg) _mfn(__page_to_mfn(_pg)) - /* * We may store INVALID_MFN in PTEs. We need to clip this to avoid trampling * over higher-order bits (NX, p2m type, IOMMU flags). We seem to not need diff --git a/xen/arch/x86/pv/iret.c b/xen/arch/x86/pv/iret.c index 56aeac360a..ca433a69c4 100644 --- a/xen/arch/x86/pv/iret.c +++ b/xen/arch/x86/pv/iret.c @@ -24,12 +24,6 @@ #include #include -/* Override macros from asm/page.h to make them work with mfn_t */ -#undef mfn_to_page -#define mfn_to_page(mfn) __mfn_to_page(mfn_x(mfn)) -#undef page_to_mfn -#define page_to_mfn(pg) _mfn(__page_to_mfn(pg)) - unsigned long do_iret(void) { struct cpu_user_regs *regs = guest_cpu_user_regs(); diff --git a/xen/arch/x86/pv/mm.c b/xen/arch/x86/pv/mm.c index 8d7a4fd85f..b46fd94c2c 100644 --- a/xen/arch/x86/pv/mm.c +++ b/xen/arch/x86/pv/mm.c @@ -26,12 +26,6 @@ #include "mm.h" -/* Override macros from asm/page.h to make them work with mfn_t */ -#undef mfn_to_page -#define mfn_to_page(mfn) __mfn_to_page(mfn_x(mfn)) -#undef page_to_mfn -#define page_to_mfn(pg) _mfn(__page_to_mfn(pg)) - /* * Get a mapping of a PV guest's l1e for this linear address. The return * pointer should be unmapped using unmap_domain_page(). diff --git a/xen/arch/x86/pv/traps.c b/xen/arch/x86/pv/traps.c index 98549bc1ea..f48db92243 100644 --- a/xen/arch/x86/pv/traps.c +++ b/xen/arch/x86/pv/traps.c @@ -29,12 +29,6 @@ #include #include -/* Override macros from asm/page.h to make them work with mfn_t */ -#undef mfn_to_page -#define mfn_to_page(mfn) __mfn_to_page(mfn_x(mfn)) -#undef page_to_mfn -#define page_to_mfn(pg) _mfn(__page_to_mfn(pg)) - void do_entry_int82(struct cpu_user_regs *regs) { if ( unlikely(untrusted_msi) )