From: Ben Pfaff <blp@cs.stanford.edu>
Date: Tue, 26 Sep 2006 20:15:37 +0000 (+0000)
Subject: Make solutions apply again.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a67e72c73404a4f0e999609478a9e1857d93d26;p=pintos-anon

Make solutions apply again.
---

diff --git a/solutions/p2.patch b/solutions/p2.patch
index 0632ffa..3b2de25 100644
--- a/solutions/p2.patch
+++ b/solutions/p2.patch
@@ -95,9 +95,9 @@ diff -u src/threads/thread.h~ src/threads/thread.h
 +    struct semaphore dead;              /* 1=child alive, 0=child dead. */
 +  };
 +
- void thread_init (void);
- void thread_start (void);
- void thread_tick (void);
+ /* If false (default), use round-robin scheduler.
+    If true, use multi-level feedback queue scheduler.
+    Controlled by kernel command-line options "-o mlfqs".
 Index: src/userprog/exception.c
 diff -u src/userprog/exception.c~ src/userprog/exception.c
 --- src/userprog/exception.c~
diff --git a/solutions/p3.patch b/solutions/p3.patch
index f8d8591..c7c9df8 100644
--- a/solutions/p3.patch
+++ b/solutions/p3.patch
@@ -289,9 +289,9 @@ diff -u src/threads/thread.h~ src/threads/thread.h
 +    struct semaphore dead;              /* 1=child alive, 0=child dead. */
 +  };
 +
- void thread_init (void);
- void thread_start (void);
- 
+ /* If false (default), use round-robin scheduler.
+    If true, use multi-level feedback queue scheduler.
+    Controlled by kernel command-line options "-o mlfqs".
 Index: src/userprog/exception.c
 diff -u src/userprog/exception.c~ src/userprog/exception.c
 --- src/userprog/exception.c~
diff --git a/solutions/p4.patch b/solutions/p4.patch
index fff8ca1..5d0f19a 100644
--- a/solutions/p4.patch
+++ b/solutions/p4.patch
@@ -2236,9 +2236,9 @@ diff -u src/threads/thread.h~ src/threads/thread.h
 +    struct semaphore dead;              /* 1=child alive, 0=child dead. */
 +  };
 +
- void thread_init (void);
- void thread_start (void);
- 
+ /* If false (default), use round-robin scheduler.
+    If true, use multi-level feedback queue scheduler.
+    Controlled by kernel command-line options "-o mlfqs".
 Index: src/userprog/exception.c
 diff -u src/userprog/exception.c~ src/userprog/exception.c
 --- src/userprog/exception.c~