summaryrefslogtreecommitdiff
path: root/proc.c
diff options
context:
space:
mode:
authorrsc <rsc>2007-08-28 19:14:43 +0000
committerrsc <rsc>2007-08-28 19:14:43 +0000
commit5573c8f296091a484e486dcf153ce60b7c632df3 (patch)
tree281dd819d08813853131e7db2dbc7b2fa8218903 /proc.c
parenteb52c7de1dea182cc3519dc07c62b7f5fe2dfb15 (diff)
downloadxv6-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 'proc.c')
-rw-r--r--proc.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/proc.c b/proc.c
index a6d189b..6803982 100644
--- a/proc.c
+++ b/proc.c
@@ -318,7 +318,7 @@ wakeup(void *chan)
// Process won't actually exit until it returns
// to user space (see trap in trap.c).
int
-proc_kill(int pid)
+kill(int pid)
{
struct proc *p;
@@ -341,7 +341,7 @@ proc_kill(int pid)
// Exited processes remain in the zombie state
// until their parent calls wait() to find out they exited.
void
-proc_exit(void)
+exit(void)
{
struct proc *p;
int fd;
@@ -384,7 +384,7 @@ proc_exit(void)
// Wait for a child process to exit and return its pid.
// Return -1 if this process has no children.
int
-proc_wait(void)
+wait(void)
{
struct proc *p;
int i, havekids, pid;