diff options
| author | Rickard Green <[email protected]> | 2010-11-18 14:28:51 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2010-11-18 14:28:51 +0100 |
| commit | 648d80a4fa2fb48bb185d2dfb40043476b297073 (patch) | |
| tree | 946c9c985f91b1ff32c41560dd2924162e627666 /erts/emulator/beam/erl_process_lock.h | |
| parent | 45fb0ee83f92b8686955cebae038b3f930bf59e9 (diff) | |
| parent | f4aa12fc5f5756d7574311cf66cd5ec8025df682 (diff) | |
| download | otp-648d80a4fa2fb48bb185d2dfb40043476b297073.tar.gz otp-648d80a4fa2fb48bb185d2dfb40043476b297073.tar.bz2 otp-648d80a4fa2fb48bb185d2dfb40043476b297073.zip | |
Merge branch 'rickard/cpu-groups/OTP-8861' into dev
* rickard/cpu-groups/OTP-8861:
Generalize reader groups
Move cpu topology functionality into erl_cpu_topology.[ch]
Do not use more reader groups for schedulers than schedulers
Conflicts:
erts/emulator/beam/erl_init.c
Diffstat (limited to 'erts/emulator/beam/erl_process_lock.h')
| -rw-r--r-- | erts/emulator/beam/erl_process_lock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_process_lock.h b/erts/emulator/beam/erl_process_lock.h index 7cfc9893fa..4fe30c7209 100644 --- a/erts/emulator/beam/erl_process_lock.h +++ b/erts/emulator/beam/erl_process_lock.h @@ -1,7 +1,7 @@ /* * %CopyrightBegin% * - * Copyright Ericsson AB 2007-2009. All Rights Reserved. + * Copyright Ericsson AB 2007-2010. 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 @@ -334,7 +334,7 @@ erts_proc_lock_flags_cmpxchg(erts_proc_lock_t *lck, ErtsProcLocks new, extern erts_pix_lock_t erts_pix_locks[ERTS_NO_OF_PIX_LOCKS]; -void erts_init_proc_lock(void); +void erts_init_proc_lock(int cpus); void erts_proc_lock_prepare_proc_lock_waiter(void); void erts_proc_lock_failed(Process *, erts_pix_lock_t *, |