1 files changed, 11 insertions, 13 deletions

diff --git a/erts/emulator/beam/beam_bp.h b/erts/emulator/beam/beam_bp.h
index 56fa82b912..a10965191e 100644
--- a/erts/emulator/beam/beam_bp.h
+++ b/erts/emulator/beam/beam_bp.h
@@ -41,7 +41,7 @@ typedef struct {
 typedef struct bp_data_time {     /* Call time */
     Uint n;
     bp_time_hash_t *hash;
-    erts_smp_refc_t refc;
+    erts_refc_t refc;
 } BpDataTime;
 
 typedef struct {
@@ -50,13 +50,13 @@ typedef struct {
 } process_breakpoint_time_t; /* used within psd */
 
 typedef struct {
-    erts_smp_atomic_t acount;
-    erts_smp_refc_t refc;
+    erts_atomic_t acount;
+    erts_refc_t refc;
 } BpCount;
 
 typedef struct {
-    erts_smp_atomic_t tracer;
-    erts_smp_refc_t refc;
+    erts_atomic_t tracer;
+    erts_refc_t refc;
 } BpMetaTracer;
 
 typedef struct generic_bp_data {
@@ -79,9 +79,7 @@ typedef struct generic_bp {
 #define ERTS_BP_CALL_TIME_SCHEDULE_OUT     (1)
 #define ERTS_BP_CALL_TIME_SCHEDULE_EXITING (2)
 
-#ifdef ERTS_DIRTY_SCHEDULERS
-extern erts_smp_mtx_t erts_dirty_bp_ix_mtx;
-#endif
+extern erts_mtx_t erts_dirty_bp_ix_mtx;
 
 enum erts_break_op{
     ERTS_BREAK_NOP   =  0, /* Must be false */
@@ -159,7 +157,7 @@ int erts_is_native_break(ErtsCodeInfo *ci);
 int erts_is_count_break(ErtsCodeInfo *ci, Uint *count_ret);
 int erts_is_time_break(Process *p, ErtsCodeInfo *ci, Eterm *call_time);
 
-void erts_trace_time_call(Process* c_p, ErtsCodeInfo *ci, BpDataTime* bdt);
+ErtsCodeInfo* erts_trace_time_call(Process* c_p, ErtsCodeInfo *ci, BpDataTime* bdt);
 void erts_trace_time_return(Process* c_p, ErtsCodeInfo *ci);
 void erts_schedule_time_break(Process *p, Uint out);
 void erts_set_time_break(BpFunctions *f, enum erts_break_op);
@@ -173,17 +171,17 @@ ErtsCodeInfo *erts_find_local_func(ErtsCodeMFA *mfa);
 
 #if ERTS_GLB_INLINE_INCL_FUNC_DEF
 
-extern erts_smp_atomic32_t erts_active_bp_index;
-extern erts_smp_atomic32_t erts_staging_bp_index;
+extern erts_atomic32_t erts_active_bp_index;
+extern erts_atomic32_t erts_staging_bp_index;
 
 ERTS_GLB_INLINE ErtsBpIndex erts_active_bp_ix(void)
 {
-    return erts_smp_atomic32_read_nob(&erts_active_bp_index);
+    return erts_atomic32_read_nob(&erts_active_bp_index);
 }
 
 ERTS_GLB_INLINE ErtsBpIndex erts_staging_bp_ix(void)
 {
-    return erts_smp_atomic32_read_nob(&erts_staging_bp_index);
+    return erts_atomic32_read_nob(&erts_staging_bp_index);
 }
 #endif