ia64: Fix IA64_FETCHADD() macro.

include/asm-ia64/atomic.h

@@ -55,6 +55,13 @@ ia64_atomic_sub (int i, atomic_t *v)
 	return new;
 }
 
+#define atomic_add_return(i,v)						\
+	((__builtin_constant_p(i) &&					\
+	  (   (i ==  1) || (i ==  4) || (i ==  8) || (i ==  16)		\
+	   || (i == -1) || (i == -4) || (i == -8) || (i == -16)))	\
+	 ? ia64_fetch_and_add(i, &(v)->counter)				\
+	 : ia64_atomic_add(i, v))
+
 /*
  * Atomically add I to V and return TRUE if the resulting value is
  * negative.
@@ -62,15 +69,9 @@ ia64_atomic_sub (int i, atomic_t *v)
 static __inline__ int
 atomic_add_negative (int i, atomic_t *v)
 {
-	return ia64_atomic_add(i, v) < 0;
+	return atomic_add_return(i, v) < 0;
 }
 
-#define atomic_add_return(i,v)						\
-	((__builtin_constant_p(i) &&					\
-	  (   (i ==  1) || (i ==  4) || (i ==  8) || (i ==  16)		\
-	   || (i == -1) || (i == -4) || (i == -8) || (i == -16)))	\
-	 ? ia64_fetch_and_add(i, &(v)->counter)				\
-	 : ia64_atomic_add(i, v))
 
 #define atomic_sub_return(i,v)						\
 	((__builtin_constant_p(i) &&					\

include/asm-ia64/intrinsics.h

@@ -46,14 +46,10 @@ extern unsigned long __bad_increment_for_ia64_fetch_and_add (void);
 		IA64_FETCHADD(_tmp, _v, -8, sizeof(*(v)));				\
 	else if ((i) == -4)								\
 		IA64_FETCHADD(_tmp, _v, -4, sizeof(*(v)));				\
-	else if ((i) == -2)								\
-		IA64_FETCHADD(_tmp, _v, -2, sizeof(*(v)));				\
 	else if ((i) == -1)								\
 		IA64_FETCHADD(_tmp, _v, -1, sizeof(*(v)));				\
 	else if ((i) == 1)								\
 		IA64_FETCHADD(_tmp, _v, 1, sizeof(*(v)));				\
-	else if ((i) == 2)								\
-		IA64_FETCHADD(_tmp, _v, 2, sizeof(*(v)));				\
 	else if ((i) == 4)								\
 		IA64_FETCHADD(_tmp, _v, 4, sizeof(*(v)));				\
 	else if ((i) == 8)								\