aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2018-04-23 15:22:01 +0200
committerSverker Eriksson <[email protected]>2018-04-23 15:22:01 +0200
commita61b9c7c6e492ceaab33904786b859cb2868fabe (patch)
tree9ddf5251f906b7c64d5e90c97eea47c817eb2ed0 /erts
parent41e472b4b90a30a816580f8f3e2269e3b3e66ecc (diff)
parentaaf865a53a5be8d15afa5ff688cb3bdd672f4d18 (diff)
downloadotp-a61b9c7c6e492ceaab33904786b859cb2868fabe.tar.gz
otp-a61b9c7c6e492ceaab33904786b859cb2868fabe.tar.bz2
otp-a61b9c7c6e492ceaab33904786b859cb2868fabe.zip
Merge branch 'sverker/valgrind-uninit-run_queue-ptr'
* sverker/valgrind-uninit-run_queue-ptr: erts: Fix run queue pointer in proxy process
Diffstat (limited to 'erts')
-rw-r--r--erts/emulator/beam/erl_process.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/beam/erl_process.c b/erts/emulator/beam/erl_process.c
index 71541786d0..e8f58a196a 100644
--- a/erts/emulator/beam/erl_process.c
+++ b/erts/emulator/beam/erl_process.c
@@ -6093,7 +6093,7 @@ make_proxy_proc(Process *prev_proxy, Process *proc, erts_aint32_t prio)
proxy = prev_proxy;
ASSERT(erts_atomic32_read_nob(&proxy->state) & ERTS_PSFLG_PROXY);
erts_atomic32_set_nob(&proxy->state, state);
- (void) erts_set_runq_proc(proc, rq, &bound);
+ (void) erts_set_runq_proc(proxy, rq, &bound);
}
else {
proxy = erts_alloc(ERTS_ALC_T_PROC, sizeof(Process));
@@ -6106,7 +6106,7 @@ make_proxy_proc(Process *prev_proxy, Process *proc, erts_aint32_t prio)
}
#endif
erts_atomic32_init_nob(&proxy->state, state);
- erts_init_runq_proc(proc, rq, bound);
+ erts_init_runq_proc(proxy, rq, bound);
}
proxy->common.id = proc->common.id;