diff options
| author | Rickard Green <[email protected]> | 2014-12-10 13:12:11 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2014-12-10 13:12:11 +0100 |
| commit | d306a3a99907adbdd5419090df2781c2773acf1b (patch) | |
| tree | 2241640c5cca1d92625df034110c11301dd681f1 /erts/emulator/beam/erl_ptab.h | |
| parent | 3ed99869e4b3896f2d1d2ea56208bba4537129a8 (diff) | |
| parent | 1ee58f610fa2080ea616231f5c01d6339639ceb9 (diff) | |
| download | otp-d306a3a99907adbdd5419090df2781c2773acf1b.tar.gz otp-d306a3a99907adbdd5419090df2781c2773acf1b.tar.bz2 otp-d306a3a99907adbdd5419090df2781c2773acf1b.zip | |
Merge branch 'maint'
* maint:
Use the new 64-bit atomic ops API
Introduce a 64-bit atomic ops API
Diffstat (limited to 'erts/emulator/beam/erl_ptab.h')
| -rw-r--r-- | erts/emulator/beam/erl_ptab.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/erts/emulator/beam/erl_ptab.h b/erts/emulator/beam/erl_ptab.h index e3e05f14af..876241159b 100644 --- a/erts/emulator/beam/erl_ptab.h +++ b/erts/emulator/beam/erl_ptab.h @@ -88,11 +88,7 @@ typedef struct { } ErtsPTabListData; typedef struct { -#ifdef ARCH_32 - erts_smp_dw_atomic_t last_data; -#else - erts_smp_atomic_t last_data; -#endif + erts_smp_atomic64_t last_data; erts_smp_atomic32_t count; erts_smp_atomic32_t aid_ix; erts_smp_atomic32_t fid_ix; |