Index: kernel/arch/ia64/include/atomic.h
===================================================================
--- kernel/arch/ia64/include/atomic.h	(revision bdd16005b053a10072e178c234e2ba090dda380f)
+++ kernel/arch/ia64/include/atomic.h	(revision aa30c7f6d6f28083963f18b2a40f731dd3a5b11e)
@@ -36,8 +36,8 @@
 #define KERN_ia64_ATOMIC_H_
 
-static inline uint64_t test_and_set(atomic_t *val)
+static inline atomic_count_t test_and_set(atomic_t *val)
 {
-	uint64_t v;
-		
+	atomic_count_t v;
+	
 	asm volatile (
 		"movl %[v] = 0x1;;\n"
@@ -53,6 +53,5 @@
 {
 	do {
-		while (val->count)
-			;
+		while (val->count);
 	} while (test_and_set(val));
 }
@@ -60,5 +59,5 @@
 static inline void atomic_inc(atomic_t *val)
 {
-	long v;
+	atomic_count_t v;
 	
 	asm volatile (
@@ -71,5 +70,5 @@
 static inline void atomic_dec(atomic_t *val)
 {
-	long v;
+	atomic_count_t v;
 	
 	asm volatile (
@@ -80,7 +79,7 @@
 }
 
-static inline long atomic_preinc(atomic_t *val)
+static inline atomic_count_t atomic_preinc(atomic_t *val)
 {
-	long v;
+	atomic_count_t v;
 	
 	asm volatile (
@@ -93,7 +92,7 @@
 }
 
-static inline long atomic_predec(atomic_t *val)
+static inline atomic_count_t atomic_predec(atomic_t *val)
 {
-	long v;
+	atomic_count_t v;
 	
 	asm volatile (
@@ -106,7 +105,7 @@
 }
 
-static inline long atomic_postinc(atomic_t *val)
+static inline atomic_count_t atomic_postinc(atomic_t *val)
 {
-	long v;
+	atomic_count_t v;
 	
 	asm volatile (
@@ -119,7 +118,7 @@
 }
 
-static inline long atomic_postdec(atomic_t *val)
+static inline atomic_count_t atomic_postdec(atomic_t *val)
 {
-	long v;
+	atomic_count_t v;
 	
 	asm volatile (
Index: kernel/arch/ia64/include/types.h
===================================================================
--- kernel/arch/ia64/include/types.h	(revision bdd16005b053a10072e178c234e2ba090dda380f)
+++ kernel/arch/ia64/include/types.h	(revision aa30c7f6d6f28083963f18b2a40f731dd3a5b11e)
@@ -27,5 +27,5 @@
  */
 
-/** @addtogroup ia64	
+/** @addtogroup ia64
  * @{
  */
@@ -63,4 +63,5 @@
 typedef uint64_t unative_t;
 typedef int64_t native_t;
+typedef uint64_t atomic_count_t;
 
 typedef struct {