erts: Replace usage of all erts_smp prefixes to just erts

1 files changed, 16 insertions, 16 deletions

diff --git a/erts/emulator/beam/code_ix.c b/erts/emulator/beam/code_ix.c
index ba68d612e3..34e46f5f33 100644
--- a/erts/emulator/beam/code_ix.c
+++ b/erts/emulator/beam/code_ix.c
@@ -34,8 +34,8 @@
 # define CIX_TRACE(text)
 #endif
 
-erts_smp_atomic32_t the_active_code_index;
-erts_smp_atomic32_t the_staging_code_index;
+erts_atomic32_t the_active_code_index;
+erts_atomic32_t the_staging_code_index;
 
 static Process* code_writing_process = NULL;
 struct code_write_queue_item {
@@ -43,7 +43,7 @@ struct code_write_queue_item {
     struct code_write_queue_item* next;
 };
 static struct code_write_queue_item* code_write_queue = NULL;
-static erts_smp_mtx_t code_write_permission_mtx;
+static erts_mtx_t code_write_permission_mtx;
 
 #ifdef ERTS_ENABLE_LOCK_CHECK
 static erts_tsd_key_t has_code_write_permission;
@@ -55,9 +55,9 @@ void erts_code_ix_init(void)
      * single threaded with active and staging set both to zero.
      * Preloading is finished by a commit that will set things straight.
      */
-    erts_smp_atomic32_init_nob(&the_active_code_index, 0);
-    erts_smp_atomic32_init_nob(&the_staging_code_index, 0);
-    erts_smp_mtx_init(&code_write_permission_mtx, "code_write_permission", NIL,
+    erts_atomic32_init_nob(&the_active_code_index, 0);
+    erts_atomic32_init_nob(&the_staging_code_index, 0);
+    erts_mtx_init(&code_write_permission_mtx, "code_write_permission", NIL,
         ERTS_LOCK_FLAGS_PROPERTY_STATIC | ERTS_LOCK_FLAGS_CATEGORY_GENERIC);
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_tsd_key_create(&has_code_write_permission,
@@ -91,9 +91,9 @@ void erts_commit_staging_code_ix(void)
     /* We need to this lock as we are now making the staging export table active */
     export_staging_lock();
     ix = erts_staging_code_ix();
-    erts_smp_atomic32_set_nob(&the_active_code_index, ix);
+    erts_atomic32_set_nob(&the_active_code_index, ix);
     ix = (ix + 1) % ERTS_NUM_CODE_IX;
-    erts_smp_atomic32_set_nob(&the_staging_code_index, ix);
+    erts_atomic32_set_nob(&the_staging_code_index, ix);
     export_staging_unlock();
     erts_tracer_nif_clear();
     CIX_TRACE("activate");
@@ -115,10 +115,10 @@ void erts_abort_staging_code_ix(void)
 int erts_try_seize_code_write_permission(Process* c_p)
 {
     int success;
-    ASSERT(!erts_smp_thr_progress_is_blocking()); /* to avoid deadlock */
+    ASSERT(!erts_thr_progress_is_blocking()); /* to avoid deadlock */
     ASSERT(c_p != NULL);
 
-    erts_smp_mtx_lock(&code_write_permission_mtx);
+    erts_mtx_lock(&code_write_permission_mtx);
     success = (code_writing_process == NULL);
     if (success) {
 	code_writing_process = c_p;
@@ -136,21 +136,21 @@ int erts_try_seize_code_write_permission(Process* c_p)
 	code_write_queue = qitem;
 	erts_suspend(c_p, ERTS_PROC_LOCK_MAIN, NULL);
     }
-   erts_smp_mtx_unlock(&code_write_permission_mtx);
+   erts_mtx_unlock(&code_write_permission_mtx);
    return success;
 }
 
 void erts_release_code_write_permission(void)
 {
-    erts_smp_mtx_lock(&code_write_permission_mtx);
-    ERTS_SMP_LC_ASSERT(erts_has_code_write_permission());
+    erts_mtx_lock(&code_write_permission_mtx);
+    ERTS_LC_ASSERT(erts_has_code_write_permission());
     while (code_write_queue != NULL) { /* unleash the entire herd */
 	struct code_write_queue_item* qitem = code_write_queue;
-	erts_smp_proc_lock(qitem->p, ERTS_PROC_LOCK_STATUS);
+	erts_proc_lock(qitem->p, ERTS_PROC_LOCK_STATUS);
 	if (!ERTS_PROC_IS_EXITING(qitem->p)) {
 	    erts_resume(qitem->p, ERTS_PROC_LOCK_STATUS);
 	}
-	erts_smp_proc_unlock(qitem->p, ERTS_PROC_LOCK_STATUS);
+	erts_proc_unlock(qitem->p, ERTS_PROC_LOCK_STATUS);
 	code_write_queue = qitem->next;
 	erts_proc_dec_refc(qitem->p);
 	erts_free(ERTS_ALC_T_CODE_IX_LOCK_Q, qitem);
@@ -159,7 +159,7 @@ void erts_release_code_write_permission(void)
 #ifdef ERTS_ENABLE_LOCK_CHECK
     erts_tsd_set(has_code_write_permission, (void *) 0);
 #endif
-    erts_smp_mtx_unlock(&code_write_permission_mtx);
+    erts_mtx_unlock(&code_write_permission_mtx);
 }
 
 #ifdef ERTS_ENABLE_LOCK_CHECK