Move reboot() and power_off() to new file, and rename to fit convention.

[pintos-anon] / solutions / p4.patch

diff --git a/solutions/p4.patch b/solutions/p4.patch
index 1a66b52dff6e6142ce12b70111059f9036f69fed..7996c254601a9899294721238d475767d7daaf0d 100644 (file)
--- a/solutions/p4.patch
+++ b/solutions/p4.patch
@@ -2761,7 +2761,7 @@ Index: src/userprog/syscall.c
 diff -u src/userprog/syscall.c~ src/userprog/syscall.c
 --- src/userprog/syscall.c~
 +++ src/userprog/syscall.c
-@@ -1,20 +1,684 @@
+@@ -1,20 +1,685 @@
  #include "userprog/syscall.h"
  #include <stdio.h>
 +#include <string.h>
@@ -2769,6 +2769,7 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c
 +#include "userprog/process.h"
 +#include "userprog/pagedir.h"
 +#include "devices/input.h"
++#include "devices/shutdown.h"
 +#include "filesys/directory.h"
 +#include "filesys/filesys.h"
 +#include "filesys/file.h"
@@ -2974,7 +2975,7 @@ diff -u src/userprog/syscall.c~ src/userprog/syscall.c
 +static int
 +sys_halt (void)
 +{
-+  power_off ();
++  shutdown_power_off ();
 +}
 + 
 +/* Exit system call. */