diff --git a/Makefile b/Makefile index 72f72f912548deac15936f8b9604062363909054..dbc46747b542e7076c2c32637eb1a880a03ca5e6 100644 --- a/Makefile +++ b/Makefile @@ -26,10 +26,10 @@ OBJS = \ vectors.o\ # Cross-compiling (e.g., on Mac OS X) -# TOOLPREFIX = i386-jos-elf- +TOOLPREFIX = i386-jos-elf- # Using native tools (e.g., on X86 Linux) -TOOLPREFIX = +#TOOLPREFIX = CC = $(TOOLPREFIX)gcc AS = $(TOOLPREFIX)gas diff --git a/proc.c b/proc.c index cf982c126f46924f77edc713a40a494933e246ec..614a1304f293208519cc45f557aebb996c5812b1 100644 --- a/proc.c +++ b/proc.c @@ -325,7 +325,6 @@ wakeup1(void *chan) } // Wake up all processes sleeping on chan. -// Proc_table_lock is acquired and released. void wakeup(void *chan) { diff --git a/xv6-rev2.tar.gz b/xv6-rev2.tar.gz index f334fa0eaa52245a31f89e0817ee3487d7fc9c0e..be6e3906aaa982621d611bb7e754d29bee1adddd 100644 Binary files a/xv6-rev2.tar.gz and b/xv6-rev2.tar.gz differ