From patchwork Wed Oct 4 13:51:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 114779 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp3149611qgn; Wed, 4 Oct 2017 06:52:09 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCMS+FG/mqhBMhDhw4C4g6E2u9kjZDevCwtIs47cxbz+eeXDsccwgmy9bjpKIN9cuSn1s43 X-Received: by 10.84.244.2 with SMTP id g2mr6763546pll.400.1507125129666; Wed, 04 Oct 2017 06:52:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507125129; cv=none; d=google.com; s=arc-20160816; b=LEZmjqmzd3jjy35GFmGhzeAgTZaA09U+aJIwW9L2hLxTAS4ZYnCADBtvk892zizJT4 t/spIGQIjNnqMSQntuGxGT7dWwOF7zt6mfZiml7ILCPcJ43ArYyZanGEUOImK0ItB40K 7FJwmEdDBXATt0DOoCbvY3mlHMVceokKTieqaN1g5HVLCuAlQTTaBl0Dj6xh2Ll3Bvfw SLZkPciBaTMkJ1CF8PTeooTeDFD/JORDrX4+U4ubbd0ptzjSeNLBkM/EspNvqyMDgLP9 bRzR61qzzKcnTCdKssXYKTgPFwnMYJx22SxCUCwSr3Ea+mJ0510EDJnSUSLgsGNd/ew/ hl4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :arc-authentication-results; bh=jyBIdueSbMyM2GwxZ5W5w4nPHB9qpizKM0fD8lbWB4Q=; b=k0aXM8hDnFeZqwki62y9C4ADp6Znbz2Y0LzGeMhhxPuz3YcC1EXZxM35LCNlMg6aeg iU/9IPT5E/h9JTbke/uMPmP8hOyLiOtSqMuE1tf+Ugv20+s9KR1r6HXjQkeB6yA13ZRN tmAIz5EjI9w7lXB5BLq/GGwOcIYnvS/49+u5UZS32gP2jY/8tUoWcz49asqoANBv92Eb OGTzkLflqdvoWTVB4F1Ay/RbtMsz9VcvzVwczgbHyHNnwnYPRwUt9os0E7Xy+YK0j5DY P15Ts3d45IHKTvuVRKH39PbvUQDj55wDcyoUltoyXxFF6hlgtrtrcy5IqXMeew2/8smq sAxw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u16si11692838pfa.437.2017.10.04.06.52.09; Wed, 04 Oct 2017 06:52:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751567AbdJDNwI (ORCPT + 8 others); Wed, 4 Oct 2017 09:52:08 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:63562 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751176AbdJDNwH (ORCPT ); Wed, 4 Oct 2017 09:52:07 -0400 Received: from wuerfel.lan ([95.208.190.237]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0MZDZc-1djB8v1vlE-00L0sa; Wed, 04 Oct 2017 15:51:45 +0200 From: Arnd Bergmann 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 Subject: [PATCH] [STABLE-4.4, 3.18]: fix xen_swiotlb_dma_mmap prototype Date: Wed, 4 Oct 2017 15:51:29 +0200 Message-Id: <20171004135140.3720000-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:Zdz3HuvpE6LqKM5/6BUNz8rgo3MgsrQWZee/oM9zu96iqvR6dVT iJS7J23X7x+Ij3hg8+cqfjvVooL462JHe9U2v/BON8QBSHiW77bzn340yzt+0/xo4liQxyV wpCYYPhlceZoKJvix/nKVmkbX6ANUtZKFvzgkcVbHXMURCHJz0JLjoCYGw6+vn7a0CvO4pz qTrX5jPCpd6g2Yp1ZMguA== X-UI-Out-Filterresults: notjunk:1; V01:K0:jBdwix5rWqA=:sf3sZ5ZlsweMbV5z0E9z4f jKze2LJUX5eMcBqeJK4OB3ey8r3qalAmKI1PYNcjIceH4OIu3alBODtoyPAFHnmYFI/D7ik8j h5+2s17XYXafjB04wnI/KYxdDNMv19TkBwqP/UhDgHhWxsfvsWOTo/V8omO1z9NI00nK5AIhx 0TdLUB22eQkKjIdMygs+OFP2tLJd1xP6l7uz3RN79NhtE7H7ht1fbBxRpVZWb5IyvBpcC6b/g /xQTMvNA4PgYMUL2YWiQRium/4kDTAABRKzBJiDsoJe4vqb2LAWKh60VGVCz74pDeaIrw6pKp 7gP/LCpeZ7Zpg8akU9R0K/xYF4XIlEHN2k1ijsXCUhL4x4234VD9rSRX+GjKMbN7FCtzs/wwJ kpq2D2FltIo9Dd8lA04o9lpB2k2aQXtvuX5da32bYhOJCQAhItaLrZNE9z0iT4q4AG6Qo+2Vf oXsJfQTxnaLIl7g5ytAEgOQvzGKWGwG05VJGMmLMCb8EaW1HP5mwJegC+5Laeumlr6D4n1U7I EGtIvIw2tIwC5U+MtAUx6WGKM5jUrwUVYFKwWQpCjE38/fNijC5pzV4PE3RzbEo0gbLt68Sy9 zYeodcmQ3Qc56GRpgNphmzG7/k2tWjD6OntahSnJgcQlOi5pM2BXW6ZBDC+BUSdJYHfqCwwD5 3qJqRbRgIMA24LiWsfB57LPVxJrv+XiBenq+6VqqWXNNBBnFLz7/WTET6bjocmQPaCpFDvDuZ pU/YmCZEDJHP2hwhndxRfO3zMyMZOCstqW+A2A== Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 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: 2f0b82b1b830 ("swiotlb-xen: implement xen_swiotlb_dma_mmap callback") Signed-off-by: Arnd Bergmann --- drivers/xen/swiotlb-xen.c | 2 +- include/xen/swiotlb-xen.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 Reviewed-by: Stefano Stabellini diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index 622f805fb382..f7b19c25c3a4 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c @@ -689,7 +689,7 @@ EXPORT_SYMBOL_GPL(xen_swiotlb_set_dma_mask); 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) diff --git a/include/xen/swiotlb-xen.h b/include/xen/swiotlb-xen.h index fab4fb9c6442..4d7fdbf20eff 100644 --- a/include/xen/swiotlb-xen.h +++ b/include/xen/swiotlb-xen.h @@ -62,5 +62,5 @@ xen_swiotlb_set_dma_mask(struct device *dev, u64 dma_mask); 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 */