diff options
| author | Sverker Eriksson <[email protected]> | 2012-10-05 18:19:46 +0200 |
|---|---|---|
| committer | Sverker Eriksson <[email protected]> | 2012-10-05 18:19:46 +0200 |
| commit | 13348e02f5aac5509e3b7ef0ea4142e25c472b1d (patch) | |
| tree | 3d7e416da68dd8299746055e8512ab13fa0d52dd /erts/emulator/beam/erl_process.h | |
| parent | 3761c5caafae68e2c275e5f0b1357172c6951147 (diff) | |
| parent | 52fcc669df315042adb1023c4cb263898af09d0e (diff) | |
| download | otp-13348e02f5aac5509e3b7ef0ea4142e25c472b1d.tar.gz otp-13348e02f5aac5509e3b7ef0ea4142e25c472b1d.tar.bz2 otp-13348e02f5aac5509e3b7ef0ea4142e25c472b1d.zip | |
Merge branch 'sverk/code-load-refactor-later-op'
* sverk/code-load-refactor-later-op:
erts: Fix faulty lock check assert
erts: Refactor naming regarding code_write_permission
erts: Refactor tracing to use erts_schedule_thr_prgr_later_op
erts: Allow thr_prgr_later_op to reschedule
erts: Refactor code loading to use erts_schedule_thr_prgr_later_op
erts: Remove some compiler warnings
Diffstat (limited to 'erts/emulator/beam/erl_process.h')
| -rw-r--r-- | erts/emulator/beam/erl_process.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/erts/emulator/beam/erl_process.h b/erts/emulator/beam/erl_process.h index 1436e246d6..fa6961e8a4 100644 --- a/erts/emulator/beam/erl_process.h +++ b/erts/emulator/beam/erl_process.h @@ -283,9 +283,7 @@ typedef enum { #define ERTS_SSI_AUX_WORK_CHECK_CHILDREN (((erts_aint32_t) 1) << 10) #define ERTS_SSI_AUX_WORK_SET_TMO (((erts_aint32_t) 1) << 11) #define ERTS_SSI_AUX_WORK_MSEG_CACHE_CHECK (((erts_aint32_t) 1) << 12) -#define ERTS_SSI_AUX_WORK_CODE_IX_ACTIVATION (((erts_aint32_t) 1) << 13) -#define ERTS_SSI_AUX_WORK_REAP_PORTS (((erts_aint32_t) 1) << 14) -#define ERTS_SSI_AUX_WORK_FINISH_BP (((erts_aint32_t) 1) << 15) +#define ERTS_SSI_AUX_WORK_REAP_PORTS (((erts_aint32_t) 1) << 13) typedef struct ErtsSchedulerSleepInfo_ ErtsSchedulerSleepInfo; @@ -480,14 +478,6 @@ typedef struct { #endif #ifdef ERTS_SMP struct { - Process* code_stager; - ErtsThrPrgrVal thr_prgr; - } code_ix_activation; - struct { - Process* stager; - ErtsThrPrgrVal thr_prgr; - } bp_ix_activation; - struct { int *sched2jix; int jix; ErtsDelayedAuxWorkWakeupJob *job; |