fix some problems

4 files changed, 5 insertions, 5 deletions

diff --git a/SD-VBS/common/makefiles/Makefile.common b/SD-VBS/common/makefiles/Makefile.common
index ab3a6b4..15f4f56 100644
--- a/SD-VBS/common/makefiles/Makefile.common
+++ b/SD-VBS/common/makefiles/Makefile.common
@@ -29,7 +29,7 @@ PRELOAD_TIMES_DIR := $(TOP_DIR)/preload-times/$(BMARK)
 MTIMING_DIR := $(TOP_DIR)/cycles/$(BMARK)
 BMARK_DIR := $(TOP_DIR)/benchmarks/$(BMARK)
 TOOL_DIR := $(TOP_DIR)/tools
-LIBLITMUS ?= /playpen/mc2/liblitmus
+LIBLITMUS ?= /home/ae/liblitmus
 ifneq ($(shell grep "define LITMUS 1" ${TOP_DIR}/../extra.h),)
         override CFLAGS += -I${LIBLITMUS}/include -I${LIBLITMUS}/arch/arm/include
         override LDFLAGS += -L${LIBLITMUS} -llitmus
diff --git a/baseline/Makefile b/baseline/Makefile
index dad45a0..37b59ed 100644
--- a/baseline/Makefile
+++ b/baseline/Makefile
@@ -1,4 +1,4 @@
-LIBLITMUS ?= /playpen/mc2/liblitmus
+LIBLITMUS ?= /home/ae/liblitmus
 CC ?= gcc
 override CFLAGS = -pthread -O2 -I..
 LDFLAGS = -lrt
diff --git a/dis/Makefile b/dis/Makefile
index d18761b..68f19e7 100755
--- a/dis/Makefile
+++ b/dis/Makefile
@@ -2,7 +2,7 @@
 # Build the DIS benchmarks with all-pairs or unpaired instrumentation
 # (I know that this Makefile is mildly evil and breaks so many rules
 # that a good Makefile should follow. Sorry - at least I have one.)
-LIBLITMUS ?= /playpen/mc2/liblitmus
+LIBLITMUS ?= /home/ae/liblitmus
 CC ?= gcc
 override CFLAGS += -pthread -O2 -I..
 LDFLAGS = -lrt -lm
diff --git a/extra.h b/extra.h
index 1297038..5abb0c7 100644
--- a/extra.h
+++ b/extra.h
@@ -30,7 +30,7 @@ extern int sched_getcpu();
 #endif
 
 // This is a proxy for "case study mode" now
-#define LITMUS 1
+#define LITMUS 0
 #define MMDC_PROF 0
 
 #if LITMUS
@@ -88,7 +88,7 @@ static void _rt_load_params_itrl(int argc, char **argv) {
     if (argc != (9 + LITMUS*2) && argc != (10 + LITMUS*2)) {
         fprintf(stderr, "Usage: %s <name> <loops> <my core> <other core> <other name> <runID> <save results?> <pairID>\n", argv[0]);
 #else
-    if (argc != (6 + LITMUS*2)) {
+    if (argc != (7 + LITMUS*2)) {
         fprintf(stderr, "Usage: %s <name> <loops> <my core> <runID> <save results?>\n", argv[0]);
 #endif /* PAIRED */
         fprintf(stderr, " <name> string for logging. Name of this task.\n");