From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jonas Bonn Subject: Re: [PATCH 1/1] asm-generic: delay.h fix udelay and ndelay for 8 bit args Date: Fri, 22 Jul 2011 21:17:05 +0200 Message-ID: <1311362225.2660.18.camel@localhost> References: <1310986975.21015.13.camel@needafix> <1310997937-26771-1-git-send-email-jonas@southpole.se> <1311361492.2660.13.camel@localhost> <4E29CB4A.40508@zytor.com> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Return-path: Received: from mail.southpole.se ([193.12.106.18]:47918 "EHLO mail.southpole.se" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754883Ab1GVTRI (ORCPT ); Fri, 22 Jul 2011 15:17:08 -0400 In-Reply-To: <4E29CB4A.40508@zytor.com> Sender: linux-next-owner@vger.kernel.org List-ID: To: "H. Peter Anvin" Cc: sfr@canb.auug.org.au, Andrew Morton , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Ingo Molnar , Thomas Gleixner , arnd@arndb.de On Fri, 2011-07-22 at 12:11 -0700, H. Peter Anvin wrote: > On 07/22/2011 12:04 PM, Jonas Bonn wrote: > > > > On Mon, 2011-07-18 at 16:05 +0200, Jonas Bonn wrote: > >> From: Andrew Morton > >> > >> With a non-constant 8-bit argument, a call to udelay() generates a warning: > >> > > > > > >> --- > >> > >> Here's a patch that should resolve the merge conflict. This applies > >> Andrew's changes on top of the new asm-generic/delay.h instead of the x86 > >> arch-specific one. I've tested this for OpenRISC and the changed macros > >> don't cause any problems there. > >> > >> Let me know if this is OK and I'll throw it into the OpenRISC tree together > >> with the other delay.h modifications. > >> > > > > I haven't gotten any feedback on this... since the change looks > > appropriate to merge with the other changes to asm-generic/delay.h, I'll > > apply this patch there and carry the patch together with the other > > asm-generic/delay.h changes in the 'openrisc' tree. Andrew can drop the > > patch from his series to avoid the merge conflict. > > > > I hope that works for everybody... > > > > You may want to Cc: Arnd on this, since he's the asm-generic maintainer. > > Otherwise, since this is zero work on our part, it obviously works for me. > Good idea! CC:ing Arnd, too... Arnd has already reviewed the changes to delay.h. This is only about getting Andrew's fixes out of his tree where they cause a merge conflict and into asm-generic/delay.h where they belong. Thanks, Jonas