summaryrefslogtreecommitdiff
path: root/kernel/syscall.c
diff options
context:
space:
mode:
authorFrans Kaashoek <[email protected]>2019-07-17 05:53:47 -0400
committerFrans Kaashoek <[email protected]>2019-07-17 05:53:47 -0400
commitb924e44f06c9c0882a2cffe6c9215b12c5aee2e6 (patch)
treeb1204b01142d7a5b41988b87a4c06b0aabe8b5c9 /kernel/syscall.c
parentce53416f4970ebb137c8e66dc75488cfefaf084d (diff)
parentebc39372096280a4a5957d3e3836c859e5d78a79 (diff)
downloadxv6-labs-b924e44f06c9c0882a2cffe6c9215b12c5aee2e6.tar.gz
xv6-labs-b924e44f06c9c0882a2cffe6c9215b12c5aee2e6.tar.bz2
xv6-labs-b924e44f06c9c0882a2cffe6c9215b12c5aee2e6.zip
Merge branch 'riscv' of g.csail.mit.edu:xv6-dev into riscv
Diffstat (limited to 'kernel/syscall.c')
-rw-r--r--kernel/syscall.c16
1 files changed, 2 insertions, 14 deletions
diff --git a/kernel/syscall.c b/kernel/syscall.c
index 7ace671..ec04197 100644
--- a/kernel/syscall.c
+++ b/kernel/syscall.c
@@ -157,8 +157,8 @@ static uint64 (*syscalls[])(void) = {
[SYS_close] sys_close,
};
-static void
-dosyscall(void)
+void
+syscall(void)
{
int num;
struct proc *p = myproc();
@@ -174,15 +174,3 @@ dosyscall(void)
p->tf->a0 = -1;
}
}
-
-void
-syscall()
-{
- if(myproc()->killed)
- exit();
- dosyscall();
- if(myproc()->killed)
- exit();
- return;
-}
-