summaryrefslogtreecommitdiff
path: root/kernel/trap.c
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2022-08-23 07:31:08 -0400
committerFrans Kaashoek <[email protected]>2022-08-23 07:31:08 -0400
commitcd6207a972cf7692dceb837f460234eae9df5052 (patch)
treec2e1f8be9e5d030727ee4d5c4f033b8f2e5a3314 /kernel/trap.c
parentbc48c2be47ed4994d23327980737fef441fbbcc8 (diff)
parent4f716c8550b406c3e4b3e0c21b986ef99bc06c40 (diff)
downloadxv6-labs-cd6207a972cf7692dceb837f460234eae9df5052.tar.gz
xv6-labs-cd6207a972cf7692dceb837f460234eae9df5052.tar.bz2
xv6-labs-cd6207a972cf7692dceb837f460234eae9df5052.zip
Merge branch 'riscv-killed' into riscv
Diffstat (limited to 'kernel/trap.c')
-rw-r--r--kernel/trap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trap.c b/kernel/trap.c
index 524da44..512c850 100644
--- a/kernel/trap.c
+++ b/kernel/trap.c
@@ -53,7 +53,7 @@ usertrap(void)
if(r_scause() == 8){
// system call
- if(p->killed)
+ if(killed(p))
exit(-1);
// sepc points to the ecall instruction,
@@ -70,10 +70,10 @@ usertrap(void)
} else {
printf("usertrap(): unexpected scause %p pid=%d\n", r_scause(), p->pid);
printf(" sepc=%p stval=%p\n", r_sepc(), r_stval());
- p->killed = 1;
+ setkilled(p);
}
- if(p->killed)
+ if(killed(p))
exit(-1);
// give up the CPU if this is a timer interrupt.