diff options
| author | Rickard Green <[email protected]> | 2016-08-29 18:38:48 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-08-29 18:38:48 +0200 |
| commit | 5006f1e0c45d4e9b888b2c0ca48130049d33074c (patch) | |
| tree | 0dba1e3ed85e04d22755461bcce40704e0d68b49 /erts/preloaded/src/Makefile | |
| parent | 928d74ffa09bd56652d9390b02fa51ef51d71d51 (diff) | |
| parent | 0e04e76df2ea71e2e2e116afef04c497d84b1024 (diff) | |
| download | otp-5006f1e0c45d4e9b888b2c0ca48130049d33074c.tar.gz otp-5006f1e0c45d4e9b888b2c0ca48130049d33074c.tar.bz2 otp-5006f1e0c45d4e9b888b2c0ca48130049d33074c.zip | |
Merge branch 'rickard/ds-purge-module/OTP-13808' into maint
* rickard/ds-purge-module/OTP-13808:
Perform check_process_code while process is executing dirty
Conflicts:
erts/doc/src/erl_nif.xml
Diffstat (limited to 'erts/preloaded/src/Makefile')
| -rw-r--r-- | erts/preloaded/src/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/erts/preloaded/src/Makefile b/erts/preloaded/src/Makefile index df4645070b..2ab9edaf5e 100644 --- a/erts/preloaded/src/Makefile +++ b/erts/preloaded/src/Makefile @@ -45,7 +45,8 @@ PRE_LOADED_ERL_MODULES = \ erlang \ erts_internal \ erl_tracer \ - erts_literal_area_collector + erts_literal_area_collector \ + erts_dirty_process_code_checker PRE_LOADED_BEAM_MODULES = \ prim_eval |