Re: [PATCH 05/14] IA64: adapt for dma_map_ops changes
From: Tony Luck <tony.luck@intel.com>
Date: 2012-03-27 21:20:11
Also in:
linux-alpha, linux-arch, linux-arm-kernel, linux-mips, linux-mm, linux-sh, lkml, sparclinux
On Fri, Dec 23, 2011 at 4:27 AM, Marek Szyprowski [off-list ref] wrote:
From: Andrzej Pietrasiewicz <redacted> Adapt core IA64 architecture code for dma_map_ops changes: replace alloc/free_coherent with generic alloc/free methods. Signed-off-by: Andrzej Pietrasiewicz <redacted> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> --- =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 <tony.luck@intel.com>