From patchwork Tue Apr 3 15:32:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 132765 Delivered-To: patch@linaro.org Received: by 10.46.84.29 with SMTP id i29csp3954175ljb; Tue, 3 Apr 2018 08:35:19 -0700 (PDT) X-Google-Smtp-Source: AIpwx494Eku3Iuhlkpd8+o4n3V2D90/a2tbfUg12r8LlEWoZecRXrcWAT87gXS9RVRPztpa/SLGD X-Received: by 2002:a24:df04:: with SMTP id r4-v6mr5559605itg.105.1522769719256; Tue, 03 Apr 2018 08:35:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522769719; cv=none; d=google.com; s=arc-20160816; b=EOa3mmk/P/v3OnXWAsGV3zgYXTxozBShy76pVc8PvLs75I8+Gn2lobFjeevNTHXB08 i8XJuTlXGpVxtYENm3VR82Y86BxCpUjHKzxgaKTse4SJpxBFa0Ea62u4EbwCNUVKGXoo AXXv6alsOL+L7Bb0bT9qSUAT7a0F0NbxxvPdFrEFSvxLITJ3AIMJbuQXTzbqSqR9xA/i MDURrypOcVq50NdXwxF93XMy4r3UgtG5Gu0TB2nb0KAc6tsjlh6BH5+xbcrgUsrLfDfw zX6JpHFY7Tchv54QGG1yZRjQ/SWYzvPar+pCG3QjD3RI+jUkJzr3Ya7BP2/OvSezSn3J f0PA== 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=T69eKcryE3J2zM7EsZpCmlI2tBkN5eOryMZuLLD50743Lt3q0SsoUdb+32y6aEnwR2 MhmvyHRa4s8eKpcYSw9NlaZEIcba09YbuJzMgMJN4+cNzq7cOfmY62Wdk3wrAdzTsJss aOcjWWnsO4vmzpwQ0fyiqueDFztIqdtMz4gLOBOX8RJT7U7lG5ZSBE1qk21ytVTpJTOK ZOYJHH3aoSnpb1eF5tZHEgDDP4LQUlwYu7lwpvynK2C+FibWfbATwLejnbAaXgcMju6E kKKZGXUOwBV/VbGsq3fU3V6tMsoDVetxPlCKfV0MyR6NRHmf2ST4vaFcXq7tn2uodbk6 W7qA== 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 d184-v6si592637ite.132.2018.04.03.08.35.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Apr 2018 08:35:19 -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 1f3Nvs-0007qa-Cj; Tue, 03 Apr 2018 15:33:12 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1f3Nvq-0007pX-HP for xen-devel@lists.xen.org; Tue, 03 Apr 2018 15:33:10 +0000 X-Inumbo-ID: 7a33ccb5-3754-11e8-8249-2fda3a446a53 Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas1.inumbo.com (Halon) with ESMTP id 7a33ccb5-3754-11e8-8249-2fda3a446a53; Tue, 03 Apr 2018 15:34:20 +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 5ABD015AD; Tue, 3 Apr 2018 08:33:09 -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 29E1A3F24A; Tue, 3 Apr 2018 08:33:08 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Tue, 3 Apr 2018 16:32:41 +0100 Message-Id: <20180403153251.19595-7-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180403153251.19595-1-julien.grall@arm.com> References: <20180403153251.19595-1-julien.grall@arm.com> Subject: [Xen-devel] [for-4.11][PATCH v7 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) )