aboutsummaryrefslogtreecommitdiffstats
path: root/src/threads
diff options
context:
space:
mode:
authorklaar36 <klas.arvidsson@liu.se>2017-03-20 17:57:16 +0100
committerklaar36 <klas.arvidsson@liu.se>2017-03-20 17:57:16 +0100
commitd9ae213323d0a036b7f3594de6822413a4c312c6 (patch)
tree4c9f16e408d3cda4682afa28b34b1dc253c47a4c /src/threads
parent569371aca6667c0509a404d371a85e4fd5654731 (diff)
downloadpintos-rs-d9ae213323d0a036b7f3594de6822413a4c312c6.tar.gz
TIMER_FREQ test program compilation fix
Diffstat (limited to 'src/threads')
-rw-r--r--src/threads/Make.vars2
-rw-r--r--src/threads/init.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/threads/Make.vars b/src/threads/Make.vars
index dc45c2a..4c36b8f 100644
--- a/src/threads/Make.vars
+++ b/src/threads/Make.vars
@@ -1,6 +1,6 @@
# -*- makefile -*-
-os.dsk: DEFINES =
+os.dsk: DEFINES +=
KERNEL_SUBDIRS = threads devices lib lib/kernel $(TEST_SUBDIRS)
TEST_SUBDIRS = tests/threads
GRADING_FILE = $(SRCDIR)/tests/threads/Grading
diff --git a/src/threads/init.c b/src/threads/init.c
index 54cae24..16be95d 100644
--- a/src/threads/init.c
+++ b/src/threads/init.c
@@ -91,7 +91,9 @@ main (void)
/* Initialize ourselves as a thread so we can use locks,
then enable console locking. */
thread_init ();
+#ifdef USERPROG
process_init ();
+#endif
console_init ();
/* Greet user. */