From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753201AbbLUXyc (ORCPT ); Mon, 21 Dec 2015 18:54:32 -0500 Received: from zeniv.linux.org.uk ([195.92.253.2]:33108 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752367AbbLUXsK (ORCPT ); Mon, 21 Dec 2015 18:48:10 -0500 From: Al Viro To: linux-kernel@vger.kernel.org Cc: Linus Torvalds Subject: [POC][PATCH 66/83] switch xen_get_swiotlb_free_pages() to returning a pointer Date: Mon, 21 Dec 2015 23:47:39 +0000 Message-Id: <1450741676-5865-66-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <20151221234615.GW20997@ZenIV.linux.org.uk> References: <20151221234615.GW20997@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Al Viro Signed-off-by: Al Viro --- arch/arm/include/asm/xen/page.h | 2 +- arch/arm/xen/mm.c | 4 ++-- arch/x86/include/asm/xen/page.h | 4 ++-- drivers/xen/swiotlb-xen.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/include/asm/xen/page.h b/arch/arm/include/asm/xen/page.h index 415dbc6..79f92d4 100644 --- a/arch/arm/include/asm/xen/page.h +++ b/arch/arm/include/asm/xen/page.h @@ -117,6 +117,6 @@ static inline bool set_phys_to_machine(unsigned long pfn, unsigned long mfn) bool xen_arch_need_swiotlb(struct device *dev, phys_addr_t phys, dma_addr_t dev_addr); -unsigned long xen_get_swiotlb_free_pages(unsigned int order); +void *xen_get_swiotlb_free_pages(unsigned int order); #endif /* _ASM_ARM_XEN_PAGE_H */ diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c index c5f9a9e..9677c56 100644 --- a/arch/arm/xen/mm.c +++ b/arch/arm/xen/mm.c @@ -22,7 +22,7 @@ #include #include -unsigned long xen_get_swiotlb_free_pages(unsigned int order) +void *xen_get_swiotlb_free_pages(unsigned int order) { struct memblock_region *reg; gfp_t flags = __GFP_NOWARN|__GFP_KSWAPD_RECLAIM; @@ -33,7 +33,7 @@ unsigned long xen_get_swiotlb_free_pages(unsigned int order) break; } } - return __get_free_pages(flags, order); + return get_free_pages(flags, order); } enum dma_cache_op { diff --git a/arch/x86/include/asm/xen/page.h b/arch/x86/include/asm/xen/page.h index f5fb840..89d7a44 100644 --- a/arch/x86/include/asm/xen/page.h +++ b/arch/x86/include/asm/xen/page.h @@ -304,9 +304,9 @@ static inline bool xen_arch_need_swiotlb(struct device *dev, return false; } -static inline unsigned long xen_get_swiotlb_free_pages(unsigned int order) +static inline void *xen_get_swiotlb_free_pages(unsigned int order) { - return __get_free_pages(__GFP_NOWARN, order); + return get_free_pages(__GFP_NOWARN, order); } #endif /* _ASM_X86_XEN_PAGE_H */ diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index fa6b56e..952255f 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -234,7 +234,7 @@ retry: #define SLABS_PER_PAGE (1 << (PAGE_SHIFT - IO_TLB_SHIFT)) #define IO_TLB_MIN_SLABS ((1<<20) >> IO_TLB_SHIFT) while ((SLABS_PER_PAGE << order) > IO_TLB_MIN_SLABS) { - xen_io_tlb_start = (void *)xen_get_swiotlb_free_pages(order); + xen_io_tlb_start = xen_get_swiotlb_free_pages(order); if (xen_io_tlb_start) break; order--; -- 2.1.4