aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2013-06-10 13:48:13 +0200
committerRickard Green <[email protected]>2013-06-10 13:48:13 +0200
commit7c0447ddf6f134e9e25730e9afaf793db24f095c (patch)
tree8730b6b35b36f535ef3c0d195285631f2e6c02f1 /erts
parent429a774fad2696eb719834b627fc0a7322a48a34 (diff)
parent73d48da3e20430f0f6829c29289eaced73534476 (diff)
downloadotp-7c0447ddf6f134e9e25730e9afaf793db24f095c.tar.gz
otp-7c0447ddf6f134e9e25730e9afaf793db24f095c.tar.bz2
otp-7c0447ddf6f134e9e25730e9afaf793db24f095c.zip
Merge branch 'maint'
* maint: erts: Fix debug code in erts_ptab_test_next_id()
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/erl_ptab.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_ptab.c b/erts/emulator/beam/erl_ptab.c
index 8da135b2c8..f7b5f25eac 100644
--- a/erts/emulator/beam/erl_ptab.c
+++ b/erts/emulator/beam/erl_ptab.c
@@ -1435,7 +1435,7 @@ erts_ptab_test_next_id(ErtsPTab *ptab, int set, Uint next)
aid_ix = max_ix;
else
aid_ix--;
- ASSERT((aid_ix & max_ix) == (((Uint32) erts_atomic32_read_nob(&ptab->vola.tile.fid_ix)) & max_ix));
+ ASSERT((aid_ix & max_ix) == (((Uint32) erts_smp_atomic32_read_nob(&ptab->vola.tile.fid_ix)) & max_ix));
#endif
}