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/global.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/global.h')
| -rw-r--r-- | erts/emulator/beam/global.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/erts/emulator/beam/global.h b/erts/emulator/beam/global.h index ecd3c8f68a..12536f6cde 100644 --- a/erts/emulator/beam/global.h +++ b/erts/emulator/beam/global.h @@ -1728,11 +1728,6 @@ Uint erts_current_reductions(Process* current, Process *p); int erts_print_system_version(int to, void *arg, Process *c_p); -/* - * Interface to erl_init - */ -void erl_init(void); - #define seq_trace_output(token, msg, type, receiver, process) \ seq_trace_output_generic((token), (msg), (type), (receiver), (process), NIL) #define seq_trace_output_exit(token, msg, type, receiver, exitfrom) \ |