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

[pintos-anon] / doc / threads.texi

diff --git a/doc/threads.texi b/doc/threads.texi
index 1905707ffa09a631d2a7114febf6472438b52d93..a79e474b68bf2efef7d05631dce161a45a24b9c9 100644 (file)
--- a/doc/threads.texi
+++ b/doc/threads.texi
@@ -157,9 +157,9 @@ the kernel.
 Basic interrupt handling and functions for turning interrupts on and
 off.
 
 Basic interrupt handling and functions for turning interrupts on and
 off.
 

-@item intr-stubs.S
+@item intr-stubs.pl

 @itemx intr-stubs.h
 @itemx intr-stubs.h

-Assembly code for low-level interrupt handling.
+A Perl program that outputs assembly for low-level interrupt handling.

 
 @item synch.c
 @itemx synch.h
 
 @item synch.c
 @itemx synch.h


@@ -502,6 +502,10 @@ Write test code that demonstrates the cases your join works for.
 Be careful to program this function correctly.  You will need its
 functionality for project 2.
 
 Be careful to program this function correctly.  You will need its
 functionality for project 2.
 

+Once you've implemented @func{thread_join}, define
+@code{THREAD_JOIN_IMPLEMENTED} in @file{constants.h}.
+@xref{Conditional Compilation}, for more information.
+

 @node Problem 1-3 Priority Scheduling
 @section Problem 1-3: Priority Scheduling
 
 @node Problem 1-3 Priority Scheduling
 @section Problem 1-3: Priority Scheduling