From patchwork Wed Feb 21 14:02:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 129068 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp662552ljc; Wed, 21 Feb 2018 06:05:58 -0800 (PST) X-Google-Smtp-Source: AH8x224s3yHhNgLWwI7ecwMRTglsGdblvmlYHINdI8ynAWnAc+5a5SU05Pv2u7ra5pSjt9B5/1EO X-Received: by 10.31.87.69 with SMTP id l66mr2399367vkb.132.1519221958608; Wed, 21 Feb 2018 06:05:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519221958; cv=none; d=google.com; s=arc-20160816; b=e3Ie7aXJn6hyMhdy8c55vWvJs76RT0Gr+9eexz1dkchXXkluTYv97MOei7vxD2Hhvr gCwH/7veiFElDSG6GhBzEreCxUIL7YYJ9pOhX4FnY7ADO/i8doQ78CDlgyNIVA7fqbFC yrw8aL1fZz1GEyO2Rd4fnrP6fo0+5pgggzSCH0KWz5ZULXxbp6WmHu0hX8JnQGeHevdz 2Gp0+ClTA8Q9FT3GyPbVE/voW0N/uBCR7gr9RlDyl+LhjIR5O9575xZIf/r1ahawc+3+ E6bCYlwoubKJ8FUT7WiHPsB0BamAAkT2j8I4nDapkdFUZ1F3rLqEoKymviU+IiMW3UdX fdhQ== 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 :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:cc:references:in-reply-to:message-id:date:to :from:arc-authentication-results; bh=pXb9qQ/KQ9Vc34f/300499BV1AUzZRpyYFk3EitYK+E=; b=KRJkWN5nnb1oZBfouWeayOVNPMAR6X/Y634LAuTM04m9EEje0qx2LmzEvQ4/lw127g bhx6mjNh4IC7COjcvosn5RlIYcLvfEDWrCvXylfwzDr2Q0YqyF3i2DJfXDNXUUpbpMUr soxveaoqd3ylgrcSdkkjJfrSgj9wm7URnpsYG4eemCdaZpZl7pD7B1MxNhPG4P18cS7n OzwVJ6F/g2lNN+qUk4u8CsdEQPnL2a2Uay3Q93Qp4IxlM2cIZOG74OxXAjHDfXtiSX1Q Huyv4D69Tsr244C0CWZBgw4R/xh4afZkQVyFv09Twrm6RQgFfRmDseBqbN78vqH70tES KDTg== 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 r32si571547uah.97.2018.02.21.06.05.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Feb 2018 06:05:58 -0800 (PST) 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.84_2) (envelope-from ) id 1eoUzX-0004Q2-En; Wed, 21 Feb 2018 14:03:27 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eoUzW-0004OR-58 for xen-devel@lists.xen.org; Wed, 21 Feb 2018 14:03:26 +0000 X-Inumbo-ID: 31dde325-1710-11e8-b9b1-635ca7ef6cff Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas1.inumbo.com (Halon) with ESMTP id 31dde325-1710-11e8-b9b1-635ca7ef6cff; Wed, 21 Feb 2018 14:04:55 +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 4D94B15AB; Wed, 21 Feb 2018 06:03:19 -0800 (PST) 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 3E51C3F318; Wed, 21 Feb 2018 06:03:18 -0800 (PST) From: Julien Grall To: xen-devel@lists.xen.org Date: Wed, 21 Feb 2018 14:02:49 +0000 Message-Id: <20180221140259.29360-7-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180221140259.29360-1-julien.grall@arm.com> References: <20180221140259.29360-1-julien.grall@arm.com> Cc: George Dunlap , Andrew Cooper , Julien Grall , Jan Beulich Subject: [Xen-devel] [PATCH v4 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.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , 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 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 d122881d13..2a605edf7f 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) )