diff options
| author | Rickard Green <[email protected]> | 2012-02-20 12:14:26 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2012-02-20 12:14:26 +0100 |
| commit | 520ddbc83ec87bcec262680bd915184182e3998e (patch) | |
| tree | 055f08a9a435b06f0e762e15954a9e309aef9651 /erts/emulator/beam/erl_alloc_util.h | |
| parent | 102c34e414f573081a93ca49162dd78cf91949b7 (diff) | |
| parent | a393026eb77ce06711c931bf68eed12d9f8ba9c9 (diff) | |
| download | otp-520ddbc83ec87bcec262680bd915184182e3998e.tar.gz otp-520ddbc83ec87bcec262680bd915184182e3998e.tar.bz2 otp-520ddbc83ec87bcec262680bd915184182e3998e.zip | |
Merge branch 'rickard/barriers/OTP-9922' into maint
* rickard/barriers/OTP-9922:
Reduce thread progress read operations in handle_aux_work()
Misc memory barrier fixes
Diffstat (limited to 'erts/emulator/beam/erl_alloc_util.h')
| -rw-r--r-- | erts/emulator/beam/erl_alloc_util.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_alloc_util.h b/erts/emulator/beam/erl_alloc_util.h index fc1eddb116..cedf4ccf85 100644 --- a/erts/emulator/beam/erl_alloc_util.h +++ b/erts/emulator/beam/erl_alloc_util.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2002-2011. All Rights Reserved. + * Copyright Ericsson AB 2002-2012. 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 @@ -170,7 +170,9 @@ Eterm erts_alcu_info(Allctr_t *, int, int *, void *, Uint **, Uint *); void erts_alcu_init(AlcUInit_t *); void erts_alcu_current_size(Allctr_t *, AllctrSize_t *, ErtsAlcUFixInfo_t *, int); -void erts_alcu_check_delayed_dealloc(Allctr_t *, int, int *, int *); +#ifdef ERTS_SMP +void erts_alcu_check_delayed_dealloc(Allctr_t *, int, int *, ErtsThrPrgrVal *, int *); +#endif erts_aint32_t erts_alcu_fix_alloc_shrink(Allctr_t *, erts_aint32_t); #endif |