Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934759Ab2JXNU3 (ORCPT ); Wed, 24 Oct 2012 09:20:29 -0400 Received: from smtp.citrix.com ([66.165.176.89]:57900 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934696Ab2JXNTk (ORCPT ); Wed, 24 Oct 2012 09:19:40 -0400 X-IronPort-AV: E=Sophos;i="4.80,639,1344211200"; d="scan'208";a="42269818" From: Ian Campbell To: Konrad Rzeszutek Wilk CC: Stefano Stabellini , xen-devel , linux-kernel , Ian Campbell Subject: [PATCH 3/5] xen: correctly use xen_pfn_t in remap_domain_mfn_range. Date: Wed, 24 Oct 2012 14:19:35 +0100 Message-ID: <1351084777-28898-3-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1351084756.18035.28.camel@zakaz.uk.xensource.com> References: <1351084756.18035.28.camel@zakaz.uk.xensource.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1597 Lines: 44 For Xen on ARM a PFN is 64 bits so we need to use the appropriate type here. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini --- arch/x86/xen/mmu.c | 2 +- include/xen/xen-ops.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 5747a41..58f2084 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c @@ -2599,7 +2599,7 @@ static int remap_area_mfn_pte_fn(pte_t *ptep, pgtable_t token, int xen_remap_domain_mfn_range(struct vm_area_struct *vma, unsigned long addr, - unsigned long mfn, int nr, + xen_pfn_t mfn, int nr, pgprot_t prot, unsigned domid, struct page **pages) diff --git a/include/xen/xen-ops.h b/include/xen/xen-ops.h index 990b43e..ee188eb 100644 --- a/include/xen/xen-ops.h +++ b/include/xen/xen-ops.h @@ -26,7 +26,7 @@ void xen_destroy_contiguous_region(unsigned long vstart, unsigned int order); struct vm_area_struct; int xen_remap_domain_mfn_range(struct vm_area_struct *vma, unsigned long addr, - unsigned long mfn, int nr, + xen_pfn_t mfn, int nr, pgprot_t prot, unsigned domid, struct page **pages); int xen_unmap_domain_mfn_range(struct vm_area_struct *vma, -- 1.7.2.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/