X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=urcu%2Fuatomic_arch_ppc.h;h=bb74934fb19a279dfe43d7f1785ea89865756193;hb=85b577030e0dd244ed2d42aa5196a088e1e64dbb;hp=4db7007ff991de54088aa39913eeac431c65648a;hpb=1b27a7725e853b9f0673a0ed2639b8dc1065f21b;p=urcu.git

diff --git a/urcu/uatomic_arch_ppc.h b/urcu/uatomic_arch_ppc.h
index 4db7007..bb74934 100644
--- a/urcu/uatomic_arch_ppc.h
+++ b/urcu/uatomic_arch_ppc.h
@@ -64,7 +64,7 @@ unsigned long _uatomic_exchange(void *addr, unsigned long val, int len)
 
 		return result;
 	}
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		unsigned long result;
@@ -106,7 +106,7 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old,
 		__asm__ __volatile__(
 			LWSYNC_OPCODE
 		"1:\t"	"lwarx %0,0,%1\n"	/* load and reserve */
-			"cmpd %0,%3\n"		/* if load is not equal to */
+			"cmpw %0,%3\n"		/* if load is not equal to */
 			"bne 2f\n"		/* old, fail */
 			"stwcx. %2,0,%1\n"	/* else store conditional */
 			"bne- 1b\n"	 	/* retry if lost reservation */
@@ -119,7 +119,7 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old,
 
 		return old_val;
 	}
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		unsigned long old_val;
@@ -133,7 +133,7 @@ unsigned long _uatomic_cmpxchg(void *addr, unsigned long old,
 			"bne- 1b\n"	 	/* retry if lost reservation */
 			"isync\n"
 		"2:\n"
-				: "=&r"(old_val),
+				: "=&r"(old_val)
 				: "r"(addr), "r"((unsigned long)_new),
 				  "r"((unsigned long)old)
 				: "memory", "cc");
@@ -178,7 +178,7 @@ unsigned long _uatomic_add_return(void *addr, unsigned long val,
 
 		return result;
 	}
-#if (BITS_PER_LONG == 64)
+#if (CAA_BITS_PER_LONG == 64)
 	case 8:
 	{
 		unsigned long result;