From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754966AbZCYDsU (ORCPT ); Tue, 24 Mar 2009 23:48:20 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754159AbZCYDsL (ORCPT ); Tue, 24 Mar 2009 23:48:11 -0400 Received: from gate.crashing.org ([63.228.1.57]:47529 "EHLO gate.crashing.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750906AbZCYDsK (ORCPT ); Tue, 24 Mar 2009 23:48:10 -0400 Cc: linux-kernel@vger.kernel.org, mingo@elte.hu, ian.campbell@citrix.com, jeremy@goop.org Message-Id: From: Becky Bruce To: FUJITA Tomonori In-Reply-To: <20090325114023S.fujita.tomonori@lab.ntt.co.jp> Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit Mime-Version: 1.0 (Apple Message framework v930.3) Subject: Re: [PATCH 2/5] swiotlb: fix compile warning Date: Tue, 24 Mar 2009 22:42:33 -0500 References: <1237930126-6741-1-git-send-email-beckyb@kernel.crashing.org> <1237930126-6741-2-git-send-email-beckyb@kernel.crashing.org> <1237930126-6741-3-git-send-email-beckyb@kernel.crashing.org> <20090325114023S.fujita.tomonori@lab.ntt.co.jp> X-Mailer: Apple Mail (2.930.3) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mar 24, 2009, at 9:58 PM, FUJITA Tomonori wrote: > On Tue, 24 Mar 2009 16:28:43 -0500 > Becky Bruce wrote: > >> Squash a build warning seen on 32-bit powerpc caused by calling min() >> with 2 different types. Cast the first arg to size_t, which is the >> type of the second, and should be portable across architectures. >> >> Signed-off-by: Becky Bruce >> --- >> lib/swiotlb.c | 2 +- >> 1 files changed, 1 insertions(+), 1 deletions(-) >> >> diff --git a/lib/swiotlb.c b/lib/swiotlb.c >> index f59cf30..62f5f75 100644 >> --- a/lib/swiotlb.c >> +++ b/lib/swiotlb.c >> @@ -341,7 +341,7 @@ static void swiotlb_bounce(phys_addr_t phys, >> char *dma_addr, size_t size, >> unsigned long flags; >> >> while (size) { >> - sz = min(PAGE_SIZE - offset, size); >> + sz = min((size_t)(PAGE_SIZE - offset), size); >> >> local_irq_save(flags); >> buffer = kmap_atomic(pfn_to_page(pfn), > > ? > > diff --git a/lib/swiotlb.c b/lib/swiotlb.c > index f59cf30..fa62498 100644 > --- a/lib/swiotlb.c > +++ b/lib/swiotlb.c > @@ -341,7 +341,7 @@ static void swiotlb_bounce(phys_addr_t phys, > char *dma_addr, size_t size, > unsigned long flags; > > while (size) { > - sz = min(PAGE_SIZE - offset, size); > + sz = min_t(size_t, PAGE_SIZE - offset, size); > > local_irq_save(flags); > buffer = kmap_atomic(pfn_to_page(pfn), OK, we're clearly pointed at different trees here, and it looks like I'm behind - this patch is based on Ingo's master. Which tree has this change? Thanks, Becky