From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:53244 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752085AbdJDOgh (ORCPT ); Wed, 4 Oct 2017 10:36:37 -0400 Subject: Patch "fix xen_swiotlb_dma_mmap prototype" has been added to the 3.18-stable tree To: arnd@arndb.de, andrii_anisov@epam.com, boris.ostrovsky@oracle.com, david.vrabel@citrix.com, gregkh@linuxfoundation.org, konrad.wilk@oracle.com, oleksandr.dmytryshyn@globallogic.com, stefano.stabellini@eu.citrix.com Cc: , From: Date: Wed, 04 Oct 2017 16:36:45 +0200 In-Reply-To: <20171004135140.3720000-1-arnd@arndb.de> Message-ID: <150712780571170@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled fix xen_swiotlb_dma_mmap prototype to the 3.18-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: fix-xen_swiotlb_dma_mmap-prototype.patch and it can be found in the queue-3.18 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From arnd@arndb.de Wed Oct 4 16:35:39 2017 From: Arnd Bergmann Date: Wed, 4 Oct 2017 15:51:29 +0200 Subject: fix xen_swiotlb_dma_mmap prototype To: gregkh@linuxfoundation.org Cc: stable@vger.kernel.org, Boris Ostrovsky , xen-devel@lists.xenproject.org, jgross@suse.com, krzk@kernel.org, Arnd Bergmann , Konrad Rzeszutek Wilk , David Vrabel , Stefano Stabellini , Andrii Anisov , Oleksandr Dmytryshyn , linux-kernel@vger.kernel.org Message-ID: <20171004135140.3720000-1-arnd@arndb.de> From: Arnd Bergmann xen_swiotlb_dma_mmap was backported from v4.10, but older kernels before commit 00085f1efa38 ("dma-mapping: use unsigned long for dma_attrs") use a different signature: arm/xen/mm.c:202:10: error: initialization from incompatible pointer type [-Werror=incompatible-pointer-types] .mmap = xen_swiotlb_dma_mmap, ^~~~~~~~~~~~~~~~~~~~ arm/xen/mm.c:202:10: note: (near initialization for 'xen_swiotlb_dma_ops.mmap') This adapts the patch to the old calling conventions. Fixes: "swiotlb-xen: implement xen_swiotlb_dma_mmap callback" Signed-off-by: Arnd Bergmann Signed-off-by: Greg Kroah-Hartman --- drivers/xen/swiotlb-xen.c | 2 +- include/xen/swiotlb-xen.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -693,7 +693,7 @@ EXPORT_SYMBOL_GPL(xen_swiotlb_set_dma_ma int xen_swiotlb_dma_mmap(struct device *dev, struct vm_area_struct *vma, void *cpu_addr, dma_addr_t dma_addr, size_t size, - unsigned long attrs) + struct dma_attrs *attrs) { #if defined(CONFIG_ARM) || defined(CONFIG_ARM64) if (__generic_dma_ops(dev)->mmap) --- a/include/xen/swiotlb-xen.h +++ b/include/xen/swiotlb-xen.h @@ -62,5 +62,5 @@ xen_swiotlb_set_dma_mask(struct device * extern int xen_swiotlb_dma_mmap(struct device *dev, struct vm_area_struct *vma, void *cpu_addr, dma_addr_t dma_addr, size_t size, - unsigned long attrs); + struct dma_attrs *attrs); #endif /* __LINUX_SWIOTLB_XEN_H */ Patches currently in stable-queue which might be from arnd@arndb.de are queue-3.18/fix-xen_swiotlb_dma_mmap-prototype.patch