--- ./include/asm-ia64/system.h	Sun Dec 23 02:58:36 2001
+++ /usr/people/raybry/tmp/system.h	Sat Feb  2 07:53:26 2002
@@ -345,7 +345,7 @@
 		_r_ = __cmpxchg_called_with_bad_pointer();				\
 		break;									\
 	}										\
-	(__typeof__(old)) _r_;								\
+	(__typeof__(*ptr)) _r_;								\
 })
 
 #define cmpxchg_acq(ptr,o,n)	ia64_cmpxchg("acq", (ptr), (o), (n), sizeof(*(ptr)))