From 3b277b2354f7dc40596352cbd0d10f85e39b1910 Mon Sep 17 00:00:00 2001 From: Masamichi Takagi Date: Wed, 28 Feb 2018 20:50:44 +0900 Subject: [PATCH] uti: Fix dead-lock of calling terminate() from terminate() Conflicts: arch/x86_64/kernel/syscall.c kernel/syscall.c --- arch/x86_64/kernel/syscall.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/x86_64/kernel/syscall.c b/arch/x86_64/kernel/syscall.c index a2605089..2f5f8a58 100644 --- a/arch/x86_64/kernel/syscall.c +++ b/arch/x86_64/kernel/syscall.c @@ -1364,7 +1364,9 @@ done: } if (tthread->thread_offloaded) { - interrupt_syscall(tthread, sig); + if (!tthread->proc->nohost) { + interrupt_syscall(tthread, sig); + } release_thread(tthread); return 0; }