From: Andrew Morton <akpm@linux-foundation.org>

Cc: <linux-arch@vger.kernel.org>
Cc: Huang Ying <ying.huang@intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/sparc/include/asm/atomic_32.h  |    4 ++--
 arch/sparc/include/asm/atomic_64.h  |    2 +-
 arch/sparc/include/asm/atomic_def.h |    8 ++++++++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff -puN arch/sparc/include/asm/atomic_32.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-fix-fix arch/sparc/include/asm/atomic_32.h
--- a/arch/sparc/include/asm/atomic_32.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-fix-fix
+++ a/arch/sparc/include/asm/atomic_32.h
@@ -13,10 +13,10 @@
 
 #include <linux/types.h>
 
-typedef struct { volatile int counter; } atomic_t;
-
 #ifdef __KERNEL__
 
+#include <asm/atomic_def.h>
+
 #define ATOMIC_INIT(i)  { (i) }
 
 extern int __atomic_add_return(int, atomic_t *);
diff -puN arch/sparc/include/asm/atomic_64.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-fix-fix arch/sparc/include/asm/atomic_64.h
--- a/arch/sparc/include/asm/atomic_64.h~separate-atomic_t-declaration-from-asm-atomich-into-asm-atomic_defh-fix-fix
+++ a/arch/sparc/include/asm/atomic_64.h
@@ -9,8 +9,8 @@
 
 #include <linux/types.h>
 #include <asm/system.h>
+#include <asm/atomic_def.h>
 
-typedef struct { volatile int counter; } atomic_t;
 typedef struct { volatile __s64 counter; } atomic64_t;
 
 #define ATOMIC_INIT(i)		{ (i) }
diff -puN /dev/null arch/sparc/include/asm/atomic_def.h
--- /dev/null
+++ a/arch/sparc/include/asm/atomic_def.h
@@ -0,0 +1,8 @@
+#ifndef _ATOMIC_DEF_H
+#define _ATOMIC_DEF_H
+
+typedef struct {
+	volatile int counter;
+} atomic_t;
+
+#endif
_