d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFC r270239: MFV r270193:

Browse Source 
Illumos issues:
    5042 stop using deprecated atomic functions
This commit is contained in:
delphij 2014-09-03 08:13:46 +00:00
parent ce5601b1da
commit 65d8a13349
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c
View File

@ -165,11 +165,11 @@ systrace_enable(void *arg, dtrace_id_t id, void *parg)
return; return;
} }
(void) casptr(&sysent[sysnum].sy_callc, (void) atomic_cas_ptr(&sysent[sysnum].sy_callc,
(void *)systrace_sysent[sysnum].stsy_underlying, (void *)systrace_sysent[sysnum].stsy_underlying,
(void *)dtrace_systrace_syscall); (void *)dtrace_systrace_syscall);
#ifdef _SYSCALL32_IMPL #ifdef _SYSCALL32_IMPL
(void) casptr(&sysent32[sysnum].sy_callc, (void) atomic_cas_ptr(&sysent32[sysnum].sy_callc,
(void *)systrace_sysent32[sysnum].stsy_underlying, (void *)systrace_sysent32[sysnum].stsy_underlying,
(void *)dtrace_systrace_syscall32); (void *)dtrace_systrace_syscall32);
#endif #endif
@ -184,12 +184,12 @@ systrace_disable(void *arg, dtrace_id_t id, void *parg)
systrace_sysent[sysnum].stsy_return == DTRACE_IDNONE); systrace_sysent[sysnum].stsy_return == DTRACE_IDNONE);
if (disable) { if (disable) {
(void) casptr(&sysent[sysnum].sy_callc, (void) atomic_cas_ptr(&sysent[sysnum].sy_callc,
(void *)dtrace_systrace_syscall, (void *)dtrace_systrace_syscall,
(void *)systrace_sysent[sysnum].stsy_underlying); (void *)systrace_sysent[sysnum].stsy_underlying);
#ifdef _SYSCALL32_IMPL #ifdef _SYSCALL32_IMPL
(void) casptr(&sysent32[sysnum].sy_callc, (void) atomic_cas_ptr(&sysent32[sysnum].sy_callc,
(void *)dtrace_systrace_syscall32, (void *)dtrace_systrace_syscall32,
(void *)systrace_sysent32[sysnum].stsy_underlying); (void *)systrace_sysent32[sysnum].stsy_underlying);
#endif #endif

2
sys/cddl/contrib/opensolaris/uts/common/os/fm.c
View File

@ -379,7 +379,7 @@ fm_panic(const char *format, ...)
{ {
va_list ap; va_list ap;
(void) casptr((void *)&fm_panicstr, NULL, (void *)format); (void) atomic_cas_ptr((void *)&fm_panicstr, NULL, (void *)format);
#if defined(__i386) || defined(__amd64) #if defined(__i386) || defined(__amd64)
fastreboot_disable_highpil(); fastreboot_disable_highpil();
#endif /* __i386 || __amd64 */ #endif /* __i386 || __amd64 */

4
sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h
View File

@ -171,9 +171,9 @@ extern int odd_parity(ulong_t);
* to 0 otherwise. * to 0 otherwise.
*/ */
#define BT_ATOMIC_SET(bitmap, bitindex) \ #define BT_ATOMIC_SET(bitmap, bitindex) \
{ atomic_or_long(&(BT_WIM(bitmap, bitindex)), BT_BIW(bitindex)); } { atomic_or_ulong(&(BT_WIM(bitmap, bitindex)), BT_BIW(bitindex)); }
#define BT_ATOMIC_CLEAR(bitmap, bitindex) \ #define BT_ATOMIC_CLEAR(bitmap, bitindex) \
{ atomic_and_long(&(BT_WIM(bitmap, bitindex)), ~BT_BIW(bitindex)); } { atomic_and_ulong(&(BT_WIM(bitmap, bitindex)), ~BT_BIW(bitindex)); }
#define BT_ATOMIC_SET_EXCL(bitmap, bitindex, result) \ #define BT_ATOMIC_SET_EXCL(bitmap, bitindex, result) \
{ result = atomic_set_long_excl(&(BT_WIM(bitmap, bitindex)), \ { result = atomic_set_long_excl(&(BT_WIM(bitmap, bitindex)), \

4
sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h
View File

@ -524,8 +524,8 @@ typedef ulong_t cpuset_t; /* a set of CPUs */
largest = (uint_t)(highbit(set) - 1); \ largest = (uint_t)(highbit(set) - 1); \
} }
#define CPUSET_ATOMIC_DEL(set, cpu) atomic_and_long(&(set), ~CPUSET(cpu)) #define CPUSET_ATOMIC_DEL(set, cpu) atomic_and_ulong(&(set), ~CPUSET(cpu))
#define CPUSET_ATOMIC_ADD(set, cpu) atomic_or_long(&(set), CPUSET(cpu)) #define CPUSET_ATOMIC_ADD(set, cpu) atomic_or_ulong(&(set), CPUSET(cpu))
#define CPUSET_ATOMIC_XADD(set, cpu, result) \ #define CPUSET_ATOMIC_XADD(set, cpu, result) \
{ result = atomic_set_long_excl(&(set), (cpu)); } { result = atomic_set_long_excl(&(set), (cpu)); }