From 51bc5fd61fd641970b59e95145274c65c402afea Mon Sep 17 00:00:00 2001 From: Masamichi Takagi Date: Sun, 18 Feb 2018 19:11:48 +0900 Subject: [PATCH] uti: Fix wrong argument passed to ihk_ikc_release_packet() in mcexec_terminate_thread() Conflicts: executer/kernel/mcctrl/control.c --- executer/kernel/mcctrl/control.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/executer/kernel/mcctrl/control.c b/executer/kernel/mcctrl/control.c index 2bfdd0dd..350bcce0 100644 --- a/executer/kernel/mcctrl/control.c +++ b/executer/kernel/mcctrl/control.c @@ -2471,7 +2471,9 @@ mcexec_terminate_thread(ihk_os_t os, unsigned long *param, struct file *file) mcctrl_delete_per_thread_data(ppd, tsk); __return_syscall(usrdata->os, packet, param[2], tid); ihk_ikc_release_packet((struct ihk_ikc_free_packet *)packet, - (usrdata->channels + packet->ref)->c); + (usrdata->ikc2linux[smp_processor_id()] ? + usrdata->ikc2linux[smp_processor_id()] : + usrdata->ikc2linux[0])); err: if(ppd) mcctrl_put_per_proc_data(ppd);