From 07db4a80a7d58abda0f70bc06bf3033af97cefa2 Mon Sep 17 00:00:00 2001 From: Masamichi Takagi Date: Sun, 2 Sep 2018 14:31:38 +0900 Subject: [PATCH] __do_in_kernel_syscall: Move ihk_ikc_release_packet from mcexec_wait_syscall Change-Id: Ieeb5fda42dbddc9da27242f4b547c2143659f97a --- executer/kernel/mcctrl/control.c | 5 ----- executer/kernel/mcctrl/syscall.c | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/executer/kernel/mcctrl/control.c b/executer/kernel/mcctrl/control.c index 8beb2bcd..33a1adbb 100644 --- a/executer/kernel/mcctrl/control.c +++ b/executer/kernel/mcctrl/control.c @@ -1463,11 +1463,6 @@ retry_alloc: goto put_ppd_out; } - ihk_ikc_release_packet((struct ihk_ikc_free_packet *)packet, - (usrdata->ikc2linux[smp_processor_id()] ? - usrdata->ikc2linux[smp_processor_id()] : - usrdata->ikc2linux[0])); - /* Drop reference to zero and restart from add */ mcctrl_put_per_thread_data(ptd); pr_ptd("put,in_kernel", task_pid_vnr(current), ptd); diff --git a/executer/kernel/mcctrl/syscall.c b/executer/kernel/mcctrl/syscall.c index 15fabb61..dca38a83 100644 --- a/executer/kernel/mcctrl/syscall.c +++ b/executer/kernel/mcctrl/syscall.c @@ -2432,6 +2432,10 @@ sched_setparam_out: } __return_syscall(os, packet, ret, 0); + ihk_ikc_release_packet((struct ihk_ikc_free_packet *)packet, + (usrdata->ikc2linux[smp_processor_id()] ? + usrdata->ikc2linux[smp_processor_id()] : + usrdata->ikc2linux[0])); error = 0; out: