gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

temporary fix for bug #889

Browse Source
This commit is contained in:
Tomoki Shirasawa
2017-07-04 12:04:37 +09:00
parent 67843151d3
commit 0061adadfb
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
executer/kernel/mcctrl/syscall.c
View File

@@ -1770,9 +1770,6 @@ void __return_syscall(ihk_os_t os, struct ikc_scd_packet *packet,
unsigned long phys; unsigned long phys;
struct syscall_response *res; struct syscall_response *res;
if (stid == -1)
return;
phys = ihk_device_map_memory(ihk_os_to_dev(os), phys = ihk_device_map_memory(ihk_os_to_dev(os),
packet->resp_pa, sizeof(*res)); packet->resp_pa, sizeof(*res));
res = ihk_device_map_virtual(ihk_os_to_dev(os), res = ihk_device_map_virtual(ihk_os_to_dev(os),

6
kernel/syscall.c
View File

@@ -211,8 +211,7 @@ long do_syscall(struct syscall_request *req, int cpu, int pid)
send_syscall(req, cpu, pid, &res); send_syscall(req, cpu, pid, &res);
if (req->rtid == -1) { if (req->rtid == -1) {
rc = 0; preempt_disable();
goto out;
} }
dkprintf("%s: syscall num: %d waiting for Linux.. \n", dkprintf("%s: syscall num: %d waiting for Linux.. \n",
@@ -363,6 +362,9 @@ long do_syscall(struct syscall_request *req, int cpu, int pid)
send_syscall(&req2, cpu, pid, &res); send_syscall(&req2, cpu, pid, &res);
} }
} }
if (req->rtid == -1) {
preempt_enable();
}
dkprintf("%s: syscall num: %d got host reply: %d \n", dkprintf("%s: syscall num: %d got host reply: %d \n",
__FUNCTION__, req->number, res.ret); __FUNCTION__, req->number, res.ret);