svn commit: r188090 - in projects/vap7/sys: . arm/include contrib/pf dev dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5312 dev/ath/...

[Sam Leffler]

Author: sam
Date: Tue Feb  3 19:25:23 2009
New Revision: 188090
URL: http://svn.freebsd.org/changeset/base/188090

Log:
  merge r188085: force atomic_cmpset_ptr types to match atomic_cmpset_32

Modified:
  projects/vap7/sys/   (props changed)
  projects/vap7/sys/arm/include/atomic.h
  projects/vap7/sys/contrib/pf/   (props changed)
  projects/vap7/sys/dev/   (props changed)
  projects/vap7/sys/dev/ath/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5210/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5211/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5212/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5312/   (props changed)
  projects/vap7/sys/dev/ath/ath_hal/ar5416/   (props changed)
  projects/vap7/sys/dev/cxgb/   (props changed)
  projects/vap7/sys/dev/usb2/   (props changed)
  projects/vap7/sys/i386/conf/USB2   (props changed)
  projects/vap7/sys/modules/usb2/   (props changed)
  projects/vap7/sys/net80211/   (props changed)

Modified: projects/vap7/sys/arm/include/atomic.h
==============================================================================
--- projects/vap7/sys/arm/include/atomic.h	Tue Feb  3 19:21:15 2009	(r188089)
+++ projects/vap7/sys/arm/include/atomic.h	Tue Feb  3 19:25:23 2009	(r188090)
@@ -365,7 +365,8 @@ atomic_readandclear_32(volatile u_int32_
 
 #define atomic_clear_ptr		atomic_clear_32
 #define atomic_set_ptr			atomic_set_32
-#define atomic_cmpset_ptr		atomic_cmpset_32
+#define	atomic_cmpset_ptr(dst, old, new)	\
+    atomic_cmpset_32((volatile u_int *)(dst), (u_int)(old), (u_int)(new))
 #define atomic_cmpset_rel_ptr		atomic_cmpset_ptr
 #define atomic_cmpset_acq_ptr		atomic_cmpset_ptr
 #define atomic_store_ptr		atomic_store_32