Print this page
5042 stop using deprecated atomic functions

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/dtrace/systrace.c
          +++ new/usr/src/uts/common/dtrace/systrace.c
↓ open down ↓ 156 lines elided ↑ open up ↑
 157  157  #ifdef _SYSCALL32_IMPL
 158  158                  systrace_sysent32[sysnum].stsy_return = id;
 159  159  #endif
 160  160          }
 161  161  
 162  162          if (enabled) {
 163  163                  ASSERT(sysent[sysnum].sy_callc == dtrace_systrace_syscall);
 164  164                  return (0);
 165  165          }
 166  166  
 167      -        (void) casptr(&sysent[sysnum].sy_callc,
      167 +        (void) atomic_cas_ptr(&sysent[sysnum].sy_callc,
 168  168              (void *)systrace_sysent[sysnum].stsy_underlying,
 169  169              (void *)dtrace_systrace_syscall);
 170  170  #ifdef _SYSCALL32_IMPL
 171      -        (void) casptr(&sysent32[sysnum].sy_callc,
      171 +        (void) atomic_cas_ptr(&sysent32[sysnum].sy_callc,
 172  172              (void *)systrace_sysent32[sysnum].stsy_underlying,
 173  173              (void *)dtrace_systrace_syscall32);
 174  174  #endif
 175  175          return (0);
 176  176  }
 177  177  
 178  178  /*ARGSUSED*/
 179  179  static void
 180  180  systrace_disable(void *arg, dtrace_id_t id, void *parg)
 181  181  {
 182  182          int sysnum = SYSTRACE_SYSNUM((uintptr_t)parg);
 183  183          int disable = (systrace_sysent[sysnum].stsy_entry == DTRACE_IDNONE ||
 184  184              systrace_sysent[sysnum].stsy_return == DTRACE_IDNONE);
 185  185  
 186  186          if (disable) {
 187      -                (void) casptr(&sysent[sysnum].sy_callc,
      187 +                (void) atomic_cas_ptr(&sysent[sysnum].sy_callc,
 188  188                      (void *)dtrace_systrace_syscall,
 189  189                      (void *)systrace_sysent[sysnum].stsy_underlying);
 190  190  
 191  191  #ifdef _SYSCALL32_IMPL
 192      -                (void) casptr(&sysent32[sysnum].sy_callc,
      192 +                (void) atomic_cas_ptr(&sysent32[sysnum].sy_callc,
 193  193                      (void *)dtrace_systrace_syscall32,
 194  194                      (void *)systrace_sysent32[sysnum].stsy_underlying);
 195  195  #endif
 196  196          }
 197  197  
 198  198          if (SYSTRACE_ISENTRY((uintptr_t)parg)) {
 199  199                  systrace_sysent[sysnum].stsy_entry = DTRACE_IDNONE;
 200  200  #ifdef _SYSCALL32_IMPL
 201  201                  systrace_sysent32[sysnum].stsy_entry = DTRACE_IDNONE;
 202  202  #endif
↓ open down ↓ 172 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX