diff options
author | rsc <rsc> | 2007-08-28 19:14:43 +0000 |
---|---|---|
committer | rsc <rsc> | 2007-08-28 19:14:43 +0000 |
commit | 5573c8f296091a484e486dcf153ce60b7c632df3 (patch) | |
tree | 281dd819d08813853131e7db2dbc7b2fa8218903 /trap.c | |
parent | eb52c7de1dea182cc3519dc07c62b7f5fe2dfb15 (diff) | |
download | xv6-labs-5573c8f296091a484e486dcf153ce60b7c632df3.tar.gz xv6-labs-5573c8f296091a484e486dcf153ce60b7c632df3.tar.bz2 xv6-labs-5573c8f296091a484e486dcf153ce60b7c632df3.zip |
delete proc_ on proc_exit, proc_wait, proc_kill
Diffstat (limited to 'trap.c')
-rw-r--r-- | trap.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -36,11 +36,11 @@ trap(struct trapframe *tf) { if(tf->trapno == T_SYSCALL){ if(cp->killed) - proc_exit(); + exit(); cp->tf = tf; syscall(); if(cp->killed) - proc_exit(); + exit(); return; } @@ -89,7 +89,7 @@ trap(struct trapframe *tf) // (If it is still executing in the kernel, let it keep running // until it gets to the regular system call return.) if(cp && cp->killed && (tf->cs&3) == DPL_USER) - proc_exit(); + exit(); // Force process to give up CPU on clock tick. // If interrupts were on while locks held, would need to check nlock. |