svn commit: r358129 - head/sys/sys

[Jeff Roberson]

Author: jeff
Date: Wed Feb 19 19:51:09 2020
New Revision: 358129
URL: https://svnweb.freebsd.org/changeset/base/358129

Log:
  Since r357940 it is no longer possible to use a single type cast for all
  atomic_*_ptr functions.

Modified:
  head/sys/sys/smr.h

Modified: head/sys/sys/smr.h
==============================================================================
--- head/sys/sys/smr.h	Wed Feb 19 18:48:46 2020	(r358128)
+++ head/sys/sys/smr.h	Wed Feb 19 19:51:09 2020	(r358129)
@@ -120,7 +120,7 @@ typedef struct {							\
  */
 #define	smr_serialized_load(p, ex) ({					\
 	SMR_ASSERT(ex, "smr_serialized_load");				\
-	(__typeof((p)->__ptr))atomic_load_ptr((uintptr_t *)&(p)->__ptr);\
+	(__typeof((p)->__ptr))atomic_load_ptr(&(p)->__ptr);		\
 })
 
 /*
@@ -155,7 +155,7 @@ typedef struct {							\
  */
 #define	smr_unserialized_load(p, ex) ({					\
 	SMR_ASSERT(ex, "smr_unserialized_load");			\
-	(__typeof((p)->__ptr))atomic_load_ptr((uintptr_t *)&(p)->__ptr);\
+	(__typeof((p)->__ptr))atomic_load_ptr(&(p)->__ptr);		\
 })
 
 /*