diff options
| author | Sverker Eriksson <[email protected]> | 2014-06-13 15:53:07 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2014-06-13 15:53:07 +0200 |
| commit | 5c83eeffcc8c5cece2ea4bf558988304d2fc11ce (patch) | |
| tree | ca717e3aa112c1c412db1af0447aaccb7c024e5b | |
| parent | b898d66432cff541fb42b4fb761550673b568690 (diff) | |
| parent | 179f61eb3377098083c72b3fff793e6c45a68b11 (diff) | |
| download | otp-5c83eeffcc8c5cece2ea4bf558988304d2fc11ce.tar.gz otp-5c83eeffcc8c5cece2ea4bf558988304d2fc11ce.tar.bz2 otp-5c83eeffcc8c5cece2ea4bf558988304d2fc11ce.zip | |
Merge branch 'maint'
| -rw-r--r-- | erts/lib_src/common/ethr_aux.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/lib_src/common/ethr_aux.c b/erts/lib_src/common/ethr_aux.c index ceecdcef64..b77f2178f2 100644 --- a/erts/lib_src/common/ethr_aux.c +++ b/erts/lib_src/common/ethr_aux.c @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2010-2012. All Rights Reserved. + * Copyright Ericsson AB 2010-2014. All Rights Reserved. * * The contents of this file are subject to the Erlang Public License, * Version 1.1, (the "License"); you may not use this file except in @@ -360,10 +360,10 @@ static ethr_ts_event *ts_event_pool(int size, ethr_ts_event **endpp) int i; ethr_aligned_ts_event *atsev; atsev = ethr_mem__.std.alloc(sizeof(ethr_aligned_ts_event) * size - + ETHR_CACHE_LINE_SIZE); + + ETHR_CACHE_LINE_SIZE - 1); if (!atsev) return NULL; - if ((((ethr_uint_t) atsev) & ETHR_CACHE_LINE_MASK) == 0) + if ((((ethr_uint_t) atsev) & ETHR_CACHE_LINE_MASK) != 0) atsev = ((ethr_aligned_ts_event *) ((((ethr_uint_t) atsev) & ~ETHR_CACHE_LINE_MASK) + ETHR_CACHE_LINE_SIZE)); |