X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fthreads%2Fthread.c;h=ca8a8b07e3fa54769d2068e482a2cb019c2ef563;hb=c7ceee91c04fa72da655c00cb82302537ff6c9eb;hp=5229aef34d013b5bfd8bcd9c09a2983637018dc9;hpb=6c61e48a8214bad4f9b845d5c5655423d4f6a274;p=pintos-anon

diff --git a/src/threads/thread.c b/src/threads/thread.c
index 5229aef..ca8a8b0 100644
--- a/src/threads/thread.c
+++ b/src/threads/thread.c
@@ -92,7 +92,7 @@ thread_init (void)
 void
 thread_start (void) 
 {
-  thread_create ("idle", PRI_MAX, idle, NULL);
+  thread_create ("idle", PRI_MIN, idle, NULL);
   intr_enable ();
 }
 
@@ -365,7 +365,8 @@ idle (void *aux UNUSED)
          one to occur, wasting as much as one clock tick worth of
          time.
 
-         See [IA32-v2a] "HLT", [IA32-v2b] "STI", and [IA32-v3] 7.7. */
+         See [IA32-v2a] "HLT", [IA32-v2b] "STI", and [IA32-v3a]
+         7.11.1 "HLT Instruction". */
       asm ("sti; hlt");
     }
 }
@@ -482,12 +483,13 @@ schedule_tail (struct thread *prev)
 
   /* If the thread we switched from is dying, destroy its struct
      thread.  This must happen late so that thread_exit() doesn't
-     pull out the rug under itself. */
-  if (prev != NULL && prev->status == THREAD_DYING) 
+     pull out the rug under itself.  (We don't free
+     initial_thread because its memory was not obtained via
+     palloc().) */
+  if (prev != NULL && prev->status == THREAD_DYING && prev != initial_thread) 
     {
       ASSERT (prev != cur);
-      if (prev != initial_thread)
-        palloc_free_page (prev);
+      palloc_free_page (prev);
     }
 }