From: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Date: Thu, 8 May 2014 18:06:06 +0200 > On Thu, May 08, 2014 at 05:12:31PM +0200, Geert Uytterhoeven wrote: >> Hi Peter, >> >> On Thu, May 8, 2014 at 3:58 PM, Peter Zijlstra <peterz@xxxxxxxxxxxxx> wrote: >> > Many of the atomic op implementations are the same except for one >> > instruction; fold the lot into a few CPP macros and reduce LoC. >> > >> > This also prepares for easy addition of new ops. >> > >> > Cc: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> >> > Cc: Jesper Nilsson <jesper.nilsson@xxxxxxxx> >> > Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> >> > Cc: Mikael Starvik <starvik@xxxxxxxx> >> > Signed-off-by: Peter Zijlstra <peterz@xxxxxxxxxxxxx> >> > --- >> > arch/cris/include/arch-v10/arch/system.h | 2 - >> > arch/cris/include/asm/atomic.h | 57 +++++++++++++------------------ >> > 2 files changed, 25 insertions(+), 34 deletions(-) >> > >> > Index: linux-2.6/arch/cris/include/arch-v10/arch/system.h >> > =================================================================== >> > --- linux-2.6.orig/arch/cris/include/arch-v10/arch/system.h >> > +++ linux-2.6/arch/cris/include/arch-v10/arch/system.h >> > @@ -36,8 +36,6 @@ static inline unsigned long _get_base(ch >> > return 0; >> > } >> > >> > -#define nop() __asm__ __volatile__ ("nop"); >> > - >> >> Is this change supposed to be part of this series? > > Uhm, lemme double check that. Good spotting. > > Nope, it builds just fine without that hunk, *poof* gone. You did this for sparc too. -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html