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/Makefile.in | |
| 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/Makefile.in')
| -rw-r--r-- | erts/emulator/Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 76d782b159..4ed0ccabc6 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -734,7 +734,7 @@ RUN_OBJS = \ $(OBJDIR)/erl_fun.o $(OBJDIR)/erl_bif_port.o \ $(OBJDIR)/erl_term.o $(OBJDIR)/erl_node_tables.o \ $(OBJDIR)/erl_monitors.o $(OBJDIR)/erl_process_dump.o \ - $(OBJDIR)/erl_bif_timer.o \ + $(OBJDIR)/erl_bif_timer.o $(OBJDIR)/erl_cpu_topology.o \ $(OBJDIR)/erl_drv_thread.o $(OBJDIR)/erl_bif_chksum.o \ $(OBJDIR)/erl_bif_re.o $(OBJDIR)/erl_unicode.o \ $(OBJDIR)/packet_parser.o $(OBJDIR)/safe_hash.o \ |