From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from psmtp.com (na3sys010amx137.postini.com [74.125.245.137]) by kanga.kvack.org (Postfix) with SMTP id 335B26B0100 for ; Tue, 27 Mar 2012 17:20:06 -0400 (EDT) Received: by iajr24 with SMTP id r24so544559iaj.14 for ; Tue, 27 Mar 2012 14:20:05 -0700 (PDT) MIME-Version: 1.0 In-Reply-To: <1324643253-3024-6-git-send-email-m.szyprowski@samsung.com> References: <1324643253-3024-1-git-send-email-m.szyprowski@samsung.com> <1324643253-3024-6-git-send-email-m.szyprowski@samsung.com> Date: Tue, 27 Mar 2012 14:20:05 -0700 Message-ID: Subject: Re: [PATCH 05/14] IA64: adapt for dma_map_ops changes From: Tony Luck Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Sender: owner-linux-mm@kvack.org List-ID: To: Marek Szyprowski Cc: linux-kernel@vger.kernel.org, Benjamin Herrenschmidt , Thomas Gleixner , Andrew Morton , Arnd Bergmann , Stephen Rothwell , microblaze-uclinux@itee.uq.edu.au, linux-arch@vger.kernel.org, x86@kernel.org, linux-sh@vger.kernel.org, linux-alpha@vger.kernel.org, sparclinux@vger.kernel.org, linux-ia64@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-mips@linux-mips.org, discuss@x86-64.org, linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linaro-mm-sig@lists.linaro.org, Jonathan Corbet , Kyungmin Park , Andrzej Pietrasiewicz On Fri, Dec 23, 2011 at 4:27 AM, Marek Szyprowski wrote: > From: Andrzej Pietrasiewicz > > Adapt core IA64 architecture code for dma_map_ops changes: replace > alloc/free_coherent with generic alloc/free methods. > > Signed-off-by: Andrzej Pietrasiewicz > Signed-off-by: Marek Szyprowski > Signed-off-by: Kyungmin Park > --- > =A0arch/ia64/hp/common/sba_iommu.c =A0 =A0 | =A0 11 ++++++----- > =A0arch/ia64/include/asm/dma-mapping.h | =A0 18 ++++++++++++------ > =A0arch/ia64/kernel/pci-swiotlb.c =A0 =A0 =A0| =A0 =A09 +++++---- > =A0arch/ia64/sn/pci/pci_dma.c =A0 =A0 =A0 =A0 =A0| =A0 =A09 +++++---- > =A04 files changed, 28 insertions(+), 19 deletions(-) The series breaks bisection from part 2 (when the x86 part changes lib/swiotlb.c) until part 5 (when ia64 sees the changes to match). You could either merge= part 5 into part 2 (to make a combined x86+ia64 piece) ... or try to pull the libswiotlb changes into their own piece (which would have some of the ia64 and x86 bit= s). Or at the very least minimize the breakage window by putting ia64 right after x86 in the patch sequence. Otherwise seems OK Acked-by: Tony Luck -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/ Don't email: email@kvack.org