From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756349AbaKSRdp (ORCPT ); Wed, 19 Nov 2014 12:33:45 -0500 Received: from smtp.citrix.com ([66.165.176.89]:52178 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754439AbaKSRdo (ORCPT ); Wed, 19 Nov 2014 12:33:44 -0500 X-IronPort-AV: E=Sophos;i="5.07,418,1413244800"; d="scan'208";a="192964554" Date: Wed, 19 Nov 2014 17:33:18 +0000 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: David Vrabel CC: , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , , , Konrad Rzeszutek Wilk , Boris Ostrovsky , Greg Kroah-Hartman , Tony Luck , Fenghua Yu , Subject: Re: [PATCH 2/4] ia64: use common dma_get_required_mask_from_pfn() In-Reply-To: <1416412921-23671-3-git-send-email-david.vrabel@citrix.com> Message-ID: References: <1416412921-23671-1-git-send-email-david.vrabel@citrix.com> <1416412921-23671-3-git-send-email-david.vrabel@citrix.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" X-DLP: MIA1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, 19 Nov 2014, David Vrabel wrote: > Signed-off-by: David Vrabel > Cc: Tony Luck > Cc: Fenghua Yu > Cc: linux-ia64@vger.kernel.org Reviewed-by: Stefano Stabellini > arch/ia64/include/asm/machvec.h | 2 +- > arch/ia64/include/asm/machvec_init.h | 1 - > arch/ia64/pci/pci.c | 20 -------------------- > 3 files changed, 1 insertion(+), 22 deletions(-) > > diff --git a/arch/ia64/include/asm/machvec.h b/arch/ia64/include/asm/machvec.h > index 9c39bdf..beaa47d 100644 > --- a/arch/ia64/include/asm/machvec.h > +++ b/arch/ia64/include/asm/machvec.h > @@ -287,7 +287,7 @@ extern struct dma_map_ops *dma_get_ops(struct device *); > # define platform_dma_get_ops dma_get_ops > #endif > #ifndef platform_dma_get_required_mask > -# define platform_dma_get_required_mask ia64_dma_get_required_mask > +# define platform_dma_get_required_mask dma_get_required_mask_from_max_pfn > #endif > #ifndef platform_irq_to_vector > # define platform_irq_to_vector __ia64_irq_to_vector > diff --git a/arch/ia64/include/asm/machvec_init.h b/arch/ia64/include/asm/machvec_init.h > index 37a4698..ef964b2 100644 > --- a/arch/ia64/include/asm/machvec_init.h > +++ b/arch/ia64/include/asm/machvec_init.h > @@ -3,7 +3,6 @@ > > extern ia64_mv_send_ipi_t ia64_send_ipi; > extern ia64_mv_global_tlb_purge_t ia64_global_tlb_purge; > -extern ia64_mv_dma_get_required_mask ia64_dma_get_required_mask; > extern ia64_mv_irq_to_vector __ia64_irq_to_vector; > extern ia64_mv_local_vector_to_irq __ia64_local_vector_to_irq; > extern ia64_mv_pci_get_legacy_mem_t ia64_pci_get_legacy_mem; > diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c > index 291a582..79da21b 100644 > --- a/arch/ia64/pci/pci.c > +++ b/arch/ia64/pci/pci.c > @@ -791,26 +791,6 @@ static void __init set_pci_dfl_cacheline_size(void) > pci_dfl_cache_line_size = (1 << cci.pcci_line_size) / 4; > } > > -u64 ia64_dma_get_required_mask(struct device *dev) > -{ > - u32 low_totalram = ((max_pfn - 1) << PAGE_SHIFT); > - u32 high_totalram = ((max_pfn - 1) >> (32 - PAGE_SHIFT)); > - u64 mask; > - > - if (!high_totalram) { > - /* convert to mask just covering totalram */ > - low_totalram = (1 << (fls(low_totalram) - 1)); > - low_totalram += low_totalram - 1; > - mask = low_totalram; > - } else { > - high_totalram = (1 << (fls(high_totalram) - 1)); > - high_totalram += high_totalram - 1; > - mask = (((u64)high_totalram) << 32) + 0xffffffff; > - } > - return mask; > -} > -EXPORT_SYMBOL_GPL(ia64_dma_get_required_mask); > - > u64 dma_get_required_mask(struct device *dev) > { > return platform_dma_get_required_mask(dev); > -- > 1.7.10.4 > > -- > 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://secure-web.cisco.com/1uzdEOuzPh9ddYCppJ7edARD7taQXur82_EMioIJqXcGS1lEgfETQB2j546iHGLqo8mraFv4u9YxUpICa6DurqoTbYGXFrH14KuGQfFFzn4DHYx5HIksjcOqO2hiw74xfemY9frjnyDwhuBoBc3quJ5I8zLhf8kRz1AJGBKOKY_o/http%3A%2F%2Fwww.tux.org%2Flkml%2F >