Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

Merge branch 'maint'

  • Loading branch information...
commit d9f0c6d19ed48bfb88ea80c57c83faa845604872 2 parents 6e10c90 + aa257fb
Sverker Eriksson authored March 30, 2012

Showing 1 changed file with 2 additions and 2 deletions. Show diff stats Hide diff stats

  1. 4  erts/emulator/beam/erl_process_lock.h
4  erts/emulator/beam/erl_process_lock.h
@@ -958,8 +958,6 @@ erts_pid2proc_opt(Process *c_p,
958 958
 		if (flags & ERTS_P2P_FLG_TRY_LOCK)
959 959
 		    proc = ERTS_PROC_LOCK_BUSY;
960 960
 		else {
961  
-		    if (flags & ERTS_P2P_FLG_SMP_INC_REFC)
962  
-			proc->lock.refc++;
963 961
 #ifdef ERTS_ENABLE_LOCK_COUNT
964 962
 		    erts_lcnt_proc_lock_unaquire(&proc->lock, lcnt_locks);
965 963
 #endif
@@ -969,6 +967,8 @@ erts_pid2proc_opt(Process *c_p,
969 967
 					   pid_need_locks,
970 968
 					   pix_lock,
971 969
 					   flags);
  970
+		    if (proc && (flags & ERTS_P2P_FLG_SMP_INC_REFC))
  971
+			proc->lock.refc++;
972 972
 		}
973 973
 	    }
974 974
         }

0 notes on commit d9f0c6d

Please sign in to comment.
Something went wrong with that request. Please try again.