aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-07-31 15:26:02 +0200
committerLukas Larsson <[email protected]>2018-07-31 15:26:02 +0200
commit5d41aa941d254e5045ab4f56b78c39cc11ff4c74 (patch)
treeb31a884d20aa9c2cf31eafe89a010fe7728316fd /erts
parenta44b5b2c34cf82d9f0b070ae4e50e244606e3a4e (diff)
parent68528b5ea9f87d52d5bcb0eb0301359008c83fc7 (diff)
downloadotp-5d41aa941d254e5045ab4f56b78c39cc11ff4c74.tar.gz
otp-5d41aa941d254e5045ab4f56b78c39cc11ff4c74.tar.bz2
otp-5d41aa941d254e5045ab4f56b78c39cc11ff4c74.zip
Merge branch 'maint'
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/erl_alloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/beam/erl_alloc.c b/erts/emulator/beam/erl_alloc.c
index 166d5c48a5..36c46fd7aa 100644
--- a/erts/emulator/beam/erl_alloc.c
+++ b/erts/emulator/beam/erl_alloc.c
@@ -111,7 +111,7 @@ typedef union {
char align_afa[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(AFAllctr_t))];
AOFFAllctr_t aoffa;
char align_aoffa[ERTS_ALC_CACHE_LINE_ALIGN_SIZE(sizeof(AOFFAllctr_t))];
-} ErtsAllocatorState_t;
+} ErtsAllocatorState_t erts_align_attribute(ERTS_CACHE_LINE_SIZE);
static ErtsAllocatorState_t std_alloc_state;
static ErtsAllocatorState_t ll_alloc_state;