Index: arch/sparc64/include/atomic.h
===================================================================
--- arch/sparc64/include/atomic.h	(revision 8eb36b02a8608e77dfda8c423adf25770f567041)
+++ arch/sparc64/include/atomic.h	(revision d71007efd9bf1adac91d39ec37befb57a9123574)
@@ -31,6 +31,5 @@
 
 #include <arch/types.h>
-
-typedef struct { volatile __u64 count; } atomic_t;
+#include <typedefs.h>
 
 /** Atomic add operation.
@@ -43,5 +42,5 @@
  * @return Value of the atomic variable as it existed before addition.
  */
-static inline count_t atomic_add(atomic_t *val, int i)
+static inline long atomic_add(atomic_t *val, int i)
 {
 	__u64 a, b;
@@ -63,20 +62,20 @@
 }
 
-static inline count_t atomic_preinc(atomic_t *val)
+static inline long atomic_preinc(atomic_t *val)
 {
 	return atomic_add(val, 1) + 1;
 }
 
-static inline count_t atomic_postinc(atomic_t *val)
+static inline long atomic_postinc(atomic_t *val)
 {
 	return atomic_add(val, 1);
 }
 
-static inline count_t atomic_predec(atomic_t *val)
+static inline long atomic_predec(atomic_t *val)
 {
 	return atomic_add(val, -1) - 1;
 }
 
-static inline count_t atomic_postdec(atomic_t *val)
+static inline long atomic_postdec(atomic_t *val)
 {
 	return atomic_add(val, -1);
@@ -93,13 +92,3 @@
 }
 
-static inline void atomic_set(atomic_t *val, __u64 i)
-{
-	val->count = i;
-}
-
-static inline __u64 atomic_get(atomic_t *val)
-{
-	return val->count;
-}
-
 #endif