Author: delphij
Date: Wed Aug 20 18:29:18 2014
New Revision: 270239
URL: http://svnweb.freebsd.org/changeset/base/270239
Log:
MFV r270193:
Illumos issues:
5042 stop using deprecated atomic functions
MFC after: 2 weeks
Modified:
head/sys/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c
head/sys/cddl/contrib/opensolaris/uts/common/os/fm.c
head/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h
head/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h
Directory Properties:
head/sys/cddl/contrib/opensolaris/ (props changed)
Modified: head/sys/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c Wed Aug
20 18:10:12 2014 (r270238)
+++ head/sys/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c Wed Aug
20 18:29:18 2014 (r270239)
@@ -165,11 +165,11 @@ systrace_enable(void *arg, dtrace_id_t i
return;
}
- (void) casptr(&sysent[sysnum].sy_callc,
+ (void) atomic_cas_ptr(&sysent[sysnum].sy_callc,
(void *)systrace_sysent[sysnum].stsy_underlying,
(void *)dtrace_systrace_syscall);
#ifdef _SYSCALL32_IMPL
- (void) casptr(&sysent32[sysnum].sy_callc,
+ (void) atomic_cas_ptr(&sysent32[sysnum].sy_callc,
(void *)systrace_sysent32[sysnum].stsy_underlying,
(void *)dtrace_systrace_syscall32);
#endif
@@ -184,12 +184,12 @@ systrace_disable(void *arg, dtrace_id_t
systrace_sysent[sysnum].stsy_return == DTRACE_IDNONE);
if (disable) {
- (void) casptr(&sysent[sysnum].sy_callc,
+ (void) atomic_cas_ptr(&sysent[sysnum].sy_callc,
(void *)dtrace_systrace_syscall,
(void *)systrace_sysent[sysnum].stsy_underlying);
#ifdef _SYSCALL32_IMPL
- (void) casptr(&sysent32[sysnum].sy_callc,
+ (void) atomic_cas_ptr(&sysent32[sysnum].sy_callc,
(void *)dtrace_systrace_syscall32,
(void *)systrace_sysent32[sysnum].stsy_underlying);
#endif
Modified: head/sys/cddl/contrib/opensolaris/uts/common/os/fm.c
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/os/fm.c Wed Aug 20
18:10:12 2014 (r270238)
+++ head/sys/cddl/contrib/opensolaris/uts/common/os/fm.c Wed Aug 20
18:29:18 2014 (r270239)
@@ -379,7 +379,7 @@ fm_panic(const char *format, ...)
{
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)
fastreboot_disable_highpil();
#endif /* __i386 || __amd64 */
Modified: head/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h Wed Aug 20
18:10:12 2014 (r270238)
+++ head/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h Wed Aug 20
18:29:18 2014 (r270239)
@@ -171,9 +171,9 @@ extern int odd_parity(ulong_t);
* to 0 otherwise.
*/
#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) \
- { 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) \
{ result = atomic_set_long_excl(&(BT_WIM(bitmap, bitindex)), \
Modified: head/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h
==============================================================================
--- head/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h Wed Aug 20
18:10:12 2014 (r270238)
+++ head/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h Wed Aug 20
18:29:18 2014 (r270239)
@@ -524,8 +524,8 @@ typedef ulong_t cpuset_t; /* a set of CP
largest = (uint_t)(highbit(set) - 1); \
}
-#define CPUSET_ATOMIC_DEL(set, cpu) atomic_and_long(&(set),
~CPUSET(cpu))
-#define CPUSET_ATOMIC_ADD(set, cpu) atomic_or_long(&(set),
CPUSET(cpu))
+#define CPUSET_ATOMIC_DEL(set, cpu) atomic_and_ulong(&(set),
~CPUSET(cpu))
+#define CPUSET_ATOMIC_ADD(set, cpu) atomic_or_ulong(&(set),
CPUSET(cpu))
#define CPUSET_ATOMIC_XADD(set, cpu, result) \
{ result = atomic_set_long_excl(&(set), (cpu)); }
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
