diff options
| author | Sverker Eriksson <[email protected]> | 2016-05-31 11:08:57 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2016-05-31 11:08:57 +0200 |
| commit | 8305c497ffff7ccf7cb06635a18c84b3eb3c859f (patch) | |
| tree | ce4ec997c823d2e9075b8e8f3e3893703e0ec5d8 /erts/emulator/beam/erl_ao_firstfit_alloc.c | |
| parent | 962b25f3b2879a48a8cd0596ffad862beb82d4d9 (diff) | |
| parent | 770442cd4775a9bc56b3d0476754d8ea91ca2e2f (diff) | |
| download | otp-8305c497ffff7ccf7cb06635a18c84b3eb3c859f.tar.gz otp-8305c497ffff7ccf7cb06635a18c84b3eb3c859f.tar.bz2 otp-8305c497ffff7ccf7cb06635a18c84b3eb3c859f.zip | |
Merge branch 'sverker/bad-hash'
Diffstat (limited to 'erts/emulator/beam/erl_ao_firstfit_alloc.c')
| -rw-r--r-- | erts/emulator/beam/erl_ao_firstfit_alloc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_ao_firstfit_alloc.c b/erts/emulator/beam/erl_ao_firstfit_alloc.c index fbe4724047..7e239d1f5d 100644 --- a/erts/emulator/beam/erl_ao_firstfit_alloc.c +++ b/erts/emulator/beam/erl_ao_firstfit_alloc.c @@ -123,7 +123,7 @@ struct AOFF_Carrier_t_ { AOFF_RBTree_t rbt_node; /* My node in the carrier tree */ AOFF_RBTree_t* root; /* Root of my block tree */ }; -#define RBT_NODE_TO_MBC(PTR) ((AOFF_Carrier_t*)((char*)(PTR) - offsetof(AOFF_Carrier_t, rbt_node))) +#define RBT_NODE_TO_MBC(PTR) ErtsContainerStruct((PTR), AOFF_Carrier_t, rbt_node) /* To support carrier migration we keep two kinds of rb-trees: |