Merge branch 'rickard/atomic-type/OTP-8974' into dev

* rickard/atomic-type/OTP-8974:
  Use 32-bit atomics for system block
  Use 32-bit atomics for misc scheduling specific information
  Use 32-bit atomic for uaflgs in thread specific events
  Use 32-bit atomics for process lock flags
  Add 32-bit atomics to emulator APIs
  Use new atomic types in emulator
  Use 32-bit atomics for ethr_thr_create
  Use 32-bit atomics for mutex and rwmutex flags
  Use 32-bit atomics for events
  Add support for 32-bit atomics
  Move atomic API into own files
  Add support for 64-bit atomics on Windows
  Remove unused ethread time functionality
  Introduce ethr_sint_t and use it for atomics

1 files changed, 2 insertions, 2 deletions

diff --git a/erts/emulator/beam/beam_bp.c b/erts/emulator/beam/beam_bp.c
index 682f31b83f..31910888d1 100644
--- a/erts/emulator/beam/beam_bp.c
+++ b/erts/emulator/beam/beam_bp.c
@@ -950,8 +950,8 @@ static int set_function_break(Module *modp, BeamInstr *pc, int bif,
 	    MatchSetUnref(old_match_spec);
 	} else {
 	    BpDataCount *bdc = (BpDataCount *) bd;
-	    long count = 0;
-	    long res   = 0;
+	    erts_aint_t count = 0;
+	    erts_aint_t res   = 0;
 
 	    ASSERT(! match_spec);
 	    ASSERT(is_nil(tracer_pid));