From 645de1b75468d7c88a4977fc85430c59cc62d33c Mon Sep 17 00:00:00 2001
From: Alex Stratford <alexander3.stratford@live.uwe.ac.uk>
Date: Tue, 3 Dec 2019 18:38:19 +0000
Subject: [PATCH] Removed syscall_exit.c and fixed merge request issues
---
userprog/syscall.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/userprog/syscall.c b/userprog/syscall.c
index 151db58..97ca2bf 100644
--- a/userprog/syscall.c
+++ b/userprog/syscall.c
@@ -60,9 +60,6 @@ syscall_handler (struct intr_frame *f UNUSED)
case SYSCALL_HALT:
syscall_halt(f);
break;
- case SYSCALL_EXIT:
- syscall_exit(f);
- break;
case SYSCALL_EXEC:
syscall_exec(f);
break;
@@ -83,8 +80,8 @@ syscall_handler (struct intr_frame *f UNUSED)
break;
default:
printf ("WARNING: Invalid Syscall (%d)\n", syscall_number);
- thread_exit ();
- }
+ thread_exit();
+ }
}
static struct list *file_list;
--
GitLab