From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753731AbZE1HUn (ORCPT ); Thu, 28 May 2009 03:20:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751327AbZE1HUf (ORCPT ); Thu, 28 May 2009 03:20:35 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:55855 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750964AbZE1HUf (ORCPT ); Thu, 28 May 2009 03:20:35 -0400 Date: Thu, 28 May 2009 00:20:20 -0700 From: Andrew Morton To: FUJITA Tomonori Cc: linux-kernel@vger.kernel.org, mingo@elte.hu, tony.luck@intel.com, linux-ia64@vger.kernel.org, arnd@arndb.de, joerg.roedel@amd.com Subject: Re: [PATCH -tip v2 0/5] add common functions for struct dma_map_ops Message-Id: <20090528002020.8b68f085.akpm@linux-foundation.org> In-Reply-To: <1242359705-2117-1-git-send-email-fujita.tomonori@lab.ntt.co.jp> References: <1242359705-2117-1-git-send-email-fujita.tomonori@lab.ntt.co.jp> X-Mailer: Sylpheed 2.4.8 (GTK+ 2.12.5; x86_64-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 15 May 2009 12:55:00 +0900 FUJITA Tomonori wrote: > We unified x86 and IA64's handling of multiple dma mapping operations > (struct dma_map_ops in linux/dma-mapping.h) so we can remove > duplication in their arch/include/asm/dma-mapping.h. > > This patchset adds include/asm-generic/dma-mapping-common.h that > provides some generic dma mapping function definitions for the users > of struct dma_map_ops. This enables us to remove about 100 lines. This > also enables us to easily add CONFIG_DMA_API_DEBUG support, which only > x86 supports for now. The 4th patch adds CONFIG_DMA_API_DEBUG support > to IA64 by adding only 8 lines. > > This is against tip/master since tip has some changes to > arch/x86/include/asm/dma-mapping.h. > > The changes since the first version are > > - fixed a bug that dma_attrs is not passed properly (thanks to Arnd > Bergmann). > > - used a new name, dma-mapping-common.h, instead of dma-mapping.h > (suggested by Arnd Bergmann). > > - added Joerg's Acked-by > > = > arch/ia64/Kconfig | 1 + > arch/ia64/include/asm/dma-mapping.h | 110 ++---------------- > arch/x86/Kconfig | 1 + > arch/x86/include/asm/dma-mapping.h | 174 +--------------------------- > include/asm-generic/dma-mapping-common.h | 190 ++++++++++++++++++++++++++++++ > lib/dma-debug.c | 82 ++++++++------ > 6 files changed, 252 insertions(+), 306 deletions(-) I'm hoping that a suitable merge scheme here would be for me to merge 1/5 into mainline then to send 2/5 to Ingo and 3/5, 4/5 and 5/5 to Tony for merging. Will that all compile and work? Alternatively I can merge the lot, with suitable acking.