Apply appropriate changes from main branch to bring win0405-branch up

[pintos-anon] / doc / vm.texi

diff --git a/doc/vm.texi b/doc/vm.texi
index 6eff4925c262759137396831a46dbde7bb462d4b..4325b1361706de25909cab652022a2eb13a4c3ad 100644 (file)
--- a/doc/vm.texi
+++ b/doc/vm.texi
@@ -38,6 +38,9 @@ introduced in this project.
 You will continue to handle Pintos disks and file systems the same way
 you did in the previous assignment (@pxref{Using the File System}).
 
+Your submission should define @code{THREAD_JOIN_IMPLEMENTED} in
+@file{constants.h} (@pxref{Conditional Compilation}).
+
 @menu
 * VM Design::                   
 * Page Faults::