Re: [PATCH 07/20] arch,cris: Fold atomic_ops

[Peter Zijlstra]

On Thu, May 08, 2014 at 01:34:51PM -0400, David Miller wrote:
> You did this for sparc too.

I did indeed.

And sparc32 and sparc64 compile file without these spurious hunks.

I'm sure I needed that to make it compile at one point, but I suspect
they're remnants from the smp_mb__ shuffle which needed include file
changes.

But since then I've redone those and solved the compile issues
differently, but these hunks stuck around...

I've gone over the other patches, cris and sparc appear to be the only
ones so affected.

Just to make sure; these two hunks just went into the bit-bucket:

Index: linux-2.6/arch/sparc/include/asm/barrier_32.h
===================================================================
--- linux-2.6.orig/arch/sparc/include/asm/barrier_32.h
+++ linux-2.6/arch/sparc/include/asm/barrier_32.h
@@ -1,7 +1,6 @@
 #ifndef __SPARC_BARRIER_H
 #define __SPARC_BARRIER_H
 
-#include <asm/processor.h> /* for nop() */
 #include <asm-generic/barrier.h>
 
 #endif /* !(__SPARC_BARRIER_H) */
Index: linux-2.6/arch/sparc/include/asm/processor.h
===================================================================
--- linux-2.6.orig/arch/sparc/include/asm/processor.h
+++ linux-2.6/arch/sparc/include/asm/processor.h
@@ -6,6 +6,4 @@
 #include <asm/processor_32.h>
 #endif
 
-#define nop() 		__asm__ __volatile__ ("nop")
-
 #endif
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/