From patchwork Thu Oct 25 05:40:58 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 194042 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 62EDA2C00A5 for ; Thu, 25 Oct 2012 16:43:36 +1100 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TRGCO-0007LY-3x; Thu, 25 Oct 2012 05:41:44 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TRGCK-0007LK-Jc for linux-arm-kernel@lists.infradead.org; Thu, 25 Oct 2012 05:41:42 +0000 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MCF00KYBP56MSH0@mailout2.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 25 Oct 2012 14:41:34 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-d8-5088d10e9262 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 9D.19.12699.E01D8805; Thu, 25 Oct 2012 14:41:34 +0900 (KST) Received: from localhost.localdomain ([106.116.147.30]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MCF004E8P4J8R80@mmp1.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 25 Oct 2012 14:41:34 +0900 (KST) From: Marek Szyprowski To: Linus Torvalds Subject: [GIT PULL] CMA and DMA-mapping fixes for v3.7-rc3 Date: Thu, 25 Oct 2012 07:40:58 +0200 Message-id: <1351143658-30902-1-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrJJMWRmVeSWpSXmKPExsVy+t9jAV2+ix0BBp8uK1psenyN1YHRY/OS +gDGKC6blNSczLLUIn27BK6Mp//mMxX081fcmT6bsYHxDXcXIyeHhICJxMXe7ywQtpjEhXvr 2UBsIYFFjBKzZ5R0MXIB2RuYJI69OMMKkmATMJToetsFViQiYCTx+cUVVpAiZoEuJolvF+Yw giSEBawkTvw9DDaVRUBVouPyPXYQm1fAQ+LOnGNMXYwcQNsUJOZMspnAyL2AkWEVo2hqQXJB cVJ6rpFecWJucWleul5yfu4mRrAHn0nvYFzVYHGIUYCDUYmH96BHR4AQa2JZcWXuIUYJDmYl Ed7JD9oDhHhTEiurUovy44tKc1KLDzFKc7AoifM2e6QECAmkJ5akZqemFqQWwWSZODilGhi7 1X7arTVttM99fO78ZN/VaetUJziKlIlFzFPa+//+3Iei0rpmJnNnWSX8NHG+UZ+z9/5358fC S87wvrzAsHlSiWHF3bqTol0f90/QO7CGfet/o5aKiFQ360SphKdu1ht5uPU1/i5huy4iNend X7fdN3qSG2/HfnOtPrl3Qo626+Q/1zLrl0cosRRnJBpqMRcVJwIAfBcNgdwBAAA= X-Spam-Note: CRM114 invocation failed X-Spam-Score: -7.5 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.25 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 HDRS_LCASE Odd capitalization of message header Cc: Russell King , Arnd Bergmann , linux-kernel@vger.kernel.org, linaro-mm-sig@lists.linaro.org, Kyungmin Park , linux-arm-kernel@lists.infradead.org, Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Hi Linus, I would like to ask for pulling some minor fixes for both CMA (Contiguous Memory Allocator) and DMA-mapping framework for v3.7-rc3. ---------------------------------------------------------------- The following changes since commit 6f0c0580b70c89094b3422ba81118c7b959c7556: Linux 3.7-rc2 (2012-10-20 12:11:32 -0700) are available in the git repository at: git://git.linaro.org/people/mszyprowski/linux-dma-mapping.git fixes_for_linus for you to fetch changes up to 4e85fb831aa210fd1c5e2cb7909ac203c1f5b67f: ARM: mm: Remove unused arm_vmregion priv field (2012-10-24 07:38:15 +0200) ---------------------------------------------------------------- This pull request consists mainly of a set of one-liner fixes and cleanups for a few minor issues identified in both Contiguous Memory Allocator code and ARM DMA-mapping subsystem. Thanks! Best regards Marek Szyprowski Samsung Poland R&D Center ---------------------------------------------------------------- Patch summary: Bob Liu (1): mm: cma: alloc_contig_range: return early for err path Jingoo Han (1): ARM: dma-mapping: fix build warning in __dma_alloc() Laurent Pinchart (4): drivers: dma-contiguous: Don't redefine SZ_1M drivers: dma-coherent: Fix typo in dma_mmap_from_coherent documentation drivers: cma: Fix wrong CMA selected region size default value ARM: mm: Remove unused arm_vmregion priv field Ming Lei (1): ARM: dma-mapping: support debug_dma_mapping_error arch/arm/include/asm/dma-mapping.h | 1 + arch/arm/mm/dma-mapping.c | 2 +- arch/arm/mm/vmregion.h | 1 - drivers/base/Kconfig | 2 +- drivers/base/dma-coherent.c | 5 ++--- drivers/base/dma-contiguous.c | 5 +---- mm/page_alloc.c | 2 +- 7 files changed, 7 insertions(+), 11 deletions(-)