From cf003b2d8a2fe9c4842209d8432c24f213bab6eb Mon Sep 17 00:00:00 2001
From: Alex Stratford <alexander3.stratford@live.uwe.ac.uk>
Date: Wed, 4 Dec 2019 10:31:12 +0000
Subject: [PATCH] Fixing merge issue

---
 userprog/syscall.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/userprog/syscall.c b/userprog/syscall.c
index a494704..24427b2 100644
--- a/userprog/syscall.c
+++ b/userprog/syscall.c
@@ -58,6 +58,9 @@ 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;
-- 
GitLab