Move problem 1-2 (join) into project 2 as the "wait" system call.

[pintos-anon] / src / userprog / tss.c

diff --git a/src/userprog/tss.c b/src/userprog/tss.c
index 4b32d8507976f6995d8c242bdc8664b9ce034fbb..cddad93b54964b7795dba95b586dfa96aa8083eb 100644 (file)
--- a/src/userprog/tss.c
+++ b/src/userprog/tss.c
@@ -1,9 +1,9 @@
-#include "tss.h"
+#include "userprog/tss.h"
+#include <debug.h>
 #include <stddef.h>
-#include "debug.h"
-#include "gdt.h"
-#include "mmu.h"
-#include "palloc.h"
+#include "userprog/gdt.h"
+#include "threads/mmu.h"
+#include "threads/palloc.h"
 
 /* The Task-State Segment (TSS).
 
@@ -80,7 +80,7 @@ tss_init (void)
   /* Our TSS is never used in a call gate or task gate, so only a
      few fields of it are ever referenced, and those are the only
      ones we initialize. */
-  tss = palloc_get (PAL_ASSERT | PAL_ZERO);
+  tss = palloc_get_page (PAL_ASSERT | PAL_ZERO);
   tss->esp0 = ptov(0x20000);
   tss->ss0 = SEL_KDSEG;
   tss->bitmap = 0xdfff;