Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751842Ab3FQVi4 (ORCPT ); Mon, 17 Jun 2013 17:38:56 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:41364 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751169Ab3FQVix (ORCPT ); Mon, 17 Jun 2013 17:38:53 -0400 Date: Mon, 17 Jun 2013 14:38:51 -0700 From: Andrew Morton To: David Daney Cc: Linus Torvalds , Geert Uytterhoeven , David Daney , "Linux Kernel Mailing List" , Ralf Baechle Subject: Re: Linux 3.10-rc6 Message-Id: <20130617143851.480d327256b7cb54f292e147@linux-foundation.org> In-Reply-To: <51BF7EE9.8060308@caviumnetworks.com> References: <20130617133055.20463ce157e104af15ef60a1@linux-foundation.org> <51BF7610.10803@caviumnetworks.com> <20130617135920.587959a34da85d7940a6936f@linux-foundation.org> <51BF7ABD.3080508@caviumnetworks.com> <20130617141310.3d62ea2b05041ec5974f9525@linux-foundation.org> <51BF7EE9.8060308@caviumnetworks.com> X-Mailer: Sylpheed 3.2.0beta5 (GTK+ 2.24.10; x86_64-pc-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 Content-Length: 2206 Lines: 72 On Mon, 17 Jun 2013 14:26:01 -0700 David Daney wrote: > On 06/17/2013 02:13 PM, Andrew Morton wrote: > > On Mon, 17 Jun 2013 14:08:13 -0700 David Daney wrote: > > > >>> > >>> I think switch-back-to-a-macro is simplest and safest for now. Perhaps > >>> you can queue a 3.11 patch which restores the C function and fixes up > >>> mn10300 and ia64? > >>> > >> > >> If the patch is reverted, I will do that. > > > > I'm not proposing that we revert f21afc25f9ed4. Retain its > > functionality, but do it via a macro for 3.10. > > > > I misread your patch. Your patch may be incorrect in that the flags > variable you introduce has name space collisions with code using the > macro. Linus found this exact problem with the first version of my > patch (which was identical to your patch). Sigh. Macros do so suck. --- a/include/linux/smp.h~include-linux-smph-on_each_cpu-switch-back-to-a-macro +++ a/include/linux/smp.h @@ -11,7 +11,6 @@ #include #include #include -#include extern void cpu_idle(void); @@ -140,17 +139,14 @@ static inline int up_smp_call_function(s } #define smp_call_function(func, info, wait) \ (up_smp_call_function(func, info)) - -static inline int on_each_cpu(smp_call_func_t func, void *info, int wait) -{ - unsigned long flags; - - local_irq_save(flags); - func(info); - local_irq_restore(flags); - return 0; -} - +#define on_each_cpu(func, info, wait) \ + ({ \ + unsigned long __flags; \ + local_irq_save(__flags); \ + func(info); \ + local_irq_restore(__flags); \ + 0; \ + }) /* * Note we still need to test the mask even for UP * because we actually can get an empty mask from _ > Once you fix the name of 'flags', I hope you don't run into the same > Include Hell on ia64 and mn10300 that I did. I build-tested ia64. I don't have an mn10300 cross-compiler set up. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/