From 46037fcb88973e1dff0489196126c58baf69e7f5 Mon Sep 17 00:00:00 2001 From: Simon Schubert Date: Sat, 12 Sep 2009 16:41:25 +0200 Subject: [PATCH] atomic.h: use system namespace for function arguments We shouldn't use non-system arguments for function arguments in headers, since it might collide with other symbols. In this case it collided with exp(3) from math.h, both included by top(1) (with indirections). Reported-by: swildner@ --- sys/cpu/amd64/include/atomic.h | 12 ++++++------ sys/cpu/i386/include/atomic.h | 18 +++++++++--------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sys/cpu/amd64/include/atomic.h b/sys/cpu/amd64/include/atomic.h index 1732f354f8..cc543d3408 100644 --- a/sys/cpu/amd64/include/atomic.h +++ b/sys/cpu/amd64/include/atomic.h @@ -377,8 +377,8 @@ atomic_intr_cond_exit(__atomic_intr_t *p, void (*func)(void *), void *arg) #if defined(KLD_MODULE) extern int atomic_cmpset_int(volatile u_int *_dst, u_int _old, u_int _new); -extern long atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src); -extern u_int atomic_fetchadd_int(volatile u_int *p, u_int v); +extern long atomic_cmpset_long(volatile u_long *_dst, u_long _exp, u_long _src); +extern u_int atomic_fetchadd_int(volatile u_int *_p, u_int _v); #else @@ -411,13 +411,13 @@ atomic_cmpset_long(volatile u_long *_dst, u_long _old, u_long _new) * the previous value of *p. */ static __inline u_int -atomic_fetchadd_int(volatile u_int *p, u_int v) +atomic_fetchadd_int(volatile u_int *_p, u_int _v) { __asm __volatile(MPLOCKED "xaddl %0,%1; " \ - : "+r" (v), "=m" (*p) \ - : "m" (*p) \ + : "+r" (_v), "=m" (*_p) \ + : "m" (*_p) \ : "memory"); - return (v); + return (_v); } #endif /* KLD_MODULE */ diff --git a/sys/cpu/i386/include/atomic.h b/sys/cpu/i386/include/atomic.h index 1b4834639b..34fd431549 100644 --- a/sys/cpu/i386/include/atomic.h +++ b/sys/cpu/i386/include/atomic.h @@ -352,8 +352,8 @@ atomic_intr_cond_exit(__atomic_intr_t *p, void (*func)(void *), void *arg) #if defined(KLD_MODULE) extern int atomic_cmpset_int(volatile u_int *_dst, u_int _old, u_int _new); -extern long atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src); -extern u_int atomic_fetchadd_int(volatile u_int *p, u_int v); +extern long atomic_cmpset_long(volatile u_long *_dst, u_long _exp, u_long _src); +extern u_int atomic_fetchadd_int(volatile u_int *_p, u_int _v); #else @@ -370,10 +370,10 @@ atomic_cmpset_int(volatile u_int *_dst, u_int _old, u_int _new) } static __inline long -atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src) +atomic_cmpset_long(volatile u_long *_dst, u_long _exp, u_long _src) { - return (atomic_cmpset_int((volatile u_int *)dst, (u_int)exp, - (u_int)src)); + return (atomic_cmpset_int((volatile u_int *)_dst, (u_int)_exp, + (u_int)_src)); } /* @@ -381,13 +381,13 @@ atomic_cmpset_long(volatile u_long *dst, u_long exp, u_long src) * the previous value of *p. */ static __inline u_int -atomic_fetchadd_int(volatile u_int *p, u_int v) +atomic_fetchadd_int(volatile u_int *_p, u_int _v) { __asm __volatile(MPLOCKED "xaddl %0,%1; " \ - : "+r" (v), "=m" (*p) \ - : "m" (*p) \ + : "+r" (_v), "=m" (*_p) \ + : "m" (*_p) \ : "memory"); - return (v); + return (_v); } #endif /* KLD_MODULE */ -- 2.11.4.GIT