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

signal: check_signal must be called after check_need_resched.

Browse Source
This commit is contained in:
Tomoki Shirasawa
2018-01-28 13:38:51 +09:00
parent 54169bc3ea
commit 559fc9746c
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
kernel/mem.c
View File

@@ -1212,10 +1212,6 @@ static void page_fault_handler(void *fault_addr, uint64_t reason, void *regs)
info._sifields._sigfault.si_addr = fault_addr;
set_signal(SIGSEGV, regs, &info);
}
if(interrupt_from_user(regs)){
cpu_enable_interrupt();
check_signal(0, regs, 0);
}
goto out;
}
@@ -1224,7 +1220,11 @@ static void page_fault_handler(void *fault_addr, uint64_t reason, void *regs)
out:
dkprintf("%s: addr: %p, reason: %lx, regs: %p -> error: %d\n",
__FUNCTION__, fault_addr, reason, regs, error);
check_need_resched();
if(interrupt_from_user(regs)){
cpu_enable_interrupt();
check_need_resched();
check_signal(0, regs, 0);
}
set_cputime(0);
#ifdef PROFILE_ENABLE
if (thread->profile)