xnu-6153.11.26.tar.gz

[apple/xnu.git] / osfmk / arm / kpc_arm.c

diff --git a/osfmk/arm/kpc_arm.c b/osfmk/arm/kpc_arm.c
index b5c060a8a1fcd8cbb196f3fc7f98652472b2c78a..5d882c13b289413760c75c0726f091f4217f313f 100644 (file)
--- a/osfmk/arm/kpc_arm.c
+++ b/osfmk/arm/kpc_arm.c
@@ -282,7 +282,7 @@ kpc_set_running_xcall( void *vstate )
        set_running_configurable(mp_config->cfg_target_mask,
            mp_config->cfg_state_mask);
 
        set_running_configurable(mp_config->cfg_target_mask,
            mp_config->cfg_state_mask);
 

-       if (hw_atomic_sub(&kpc_xcall_sync, 1) == 0) {
+       if (os_atomic_dec(&kpc_xcall_sync, relaxed) == 0) {

                thread_wakeup((event_t) &kpc_xcall_sync);
        }
 }
                thread_wakeup((event_t) &kpc_xcall_sync);
        }
 }


@@ -674,7 +674,7 @@ kpc_set_reload_xcall(void *vmp_config)
 
        ml_set_interrupts_enabled(enabled);
 
 
        ml_set_interrupts_enabled(enabled);
 

-       if (hw_atomic_sub(&kpc_reload_sync, 1) == 0) {
+       if (os_atomic_dec(&kpc_reload_sync, relaxed) == 0) {

                thread_wakeup((event_t) &kpc_reload_sync);
        }
 }
                thread_wakeup((event_t) &kpc_reload_sync);
        }
 }


@@ -749,7 +749,7 @@ kpc_set_config_xcall(void *vmp_config)
                new_config += kpc_popcount(mp_config->pmc_mask);
        }
 
                new_config += kpc_popcount(mp_config->pmc_mask);
        }
 

-       if (hw_atomic_sub(&kpc_config_sync, 1) == 0) {
+       if (os_atomic_dec(&kpc_config_sync, relaxed) == 0) {

                thread_wakeup((event_t) &kpc_config_sync);
        }
 }
                thread_wakeup((event_t) &kpc_config_sync);
        }
 }


@@ -795,9 +795,9 @@ kpc_get_curcpu_counters_xcall(void *args)
        r = kpc_get_curcpu_counters(handler->classes, NULL, &handler->buf[offset]);
 
        /* number of counters added by this CPU, needs to be atomic  */
        r = kpc_get_curcpu_counters(handler->classes, NULL, &handler->buf[offset]);
 
        /* number of counters added by this CPU, needs to be atomic  */

-       hw_atomic_add(&(handler->nb_counters), r);
+       os_atomic_add(&(handler->nb_counters), r, relaxed);

 
 

-       if (hw_atomic_sub(&kpc_xread_sync, 1) == 0) {
+       if (os_atomic_dec(&kpc_xread_sync, relaxed) == 0) {

                thread_wakeup((event_t) &kpc_xread_sync);
        }
 }
                thread_wakeup((event_t) &kpc_xread_sync);
        }
 }