Reactivated syscallswip-color-terrible

4 files changed, 4 insertions, 14 deletions

diff --git a/Makefile b/Makefile
index 658c06d..fff02a9 100644
--- a/Makefile
+++ b/Makefile
@@ -70,9 +70,8 @@ AR  := ${CROSS_COMPILE}${AR}
 # Targets
 
 all     = lib ${rt-apps}
-#rt-apps = cycles base_task rt_launch rtspin release_ts measure_syscall \
-#         base_mt_task runtests colortest colorbench testcounters
-rt-apps = colortest colorbench testcounters singlepage
+rt-apps = cycles base_task rt_launch rtspin release_ts measure_syscall \
+          base_mt_task runtests colortest colorbench testcounters singlepage
 
 .PHONY: all lib clean dump-config TAGS tags cscope help
 
@@ -234,7 +233,7 @@ lib-testcounters =
 
 .SECONDEXPANSION:
 ${rt-apps}: $${obj-$$@} liblitmus.a
-        $(CC) -o $@ $(LDFLAGS) ${ldf-$@} $(filter-out liblitmus.a,$+) $(LOADLIBS) $(LDLIBS) ${liblitmus-flags} ${lib-$@}
+        $(CC) -o $@ $(LDFLAGS) ${ldf-$@} $(filter-out liblitmus.a,$+) $(LOADLIBS) $(LDLIBS) ${lib-$@} ${liblitmus-flags}
 
 # ##############################################################################
 # Dependency resolution.
@@ -272,9 +271,7 @@ $(error Cannot build without access to the LITMUS^RT kernel source)
 endif
 
 kernel-unistd-hdrs := $(foreach file,${unistd-headers},${LITMUS_KERNEL}/$(file))
-#hdr-ok     := $(shell egrep '\#include .*litmus/unistd' ${kernel-unistd-hdrs} )
-# XXX BAD BAD BAD
-hdr-ok     := blah
+hdr-ok     := $(shell egrep '\#include .*litmus/unistd' ${kernel-unistd-hdrs} )
 ifeq ($(strip $(hdr-ok)),)
 $(info (!!) Could not find LITMUS^RT system calls in ${kernel-unistd-hdrs}.)
 $(error Your kernel headers do not seem to be LITMUS^RT headers)
diff --git a/bin/colortest.c b/bin/colortest.c
index 02a9169..bc66522 100644
--- a/bin/colortest.c
+++ b/bin/colortest.c
@@ -1,7 +1,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdint.h>
-
 #include <litmus/rt_param.h>
 
 #include "color.h"
diff --git a/src/litmus.c b/src/litmus.c
index d45beaf..d3cc6bb 100644
--- a/src/litmus.c
+++ b/src/litmus.c
@@ -41,7 +41,6 @@ int be_migrate_to(int target_cpu)
         return sched_setaffinity(0, sizeof(cpu_set_t), &cpu_set);
 }
 
-#if 0
 int sporadic_task(lt_t e, lt_t p, lt_t phase,
                   int cpu, task_class_t cls,
                   budget_policy_t budget_policy, int set_cpu_set)
@@ -49,9 +48,7 @@ int sporadic_task(lt_t e, lt_t p, lt_t phase,
         return sporadic_task_ns(e * NS_PER_MS, p * NS_PER_MS, phase * NS_PER_MS,
                                 cpu, cls, budget_policy, set_cpu_set);
 }
-#endif
 
-#if 0
 int sporadic_task_ns(lt_t e, lt_t p, lt_t phase,
                         int cpu, task_class_t cls,
                         budget_policy_t budget_policy, int set_cpu_set)
@@ -77,7 +74,6 @@ int sporadic_task_ns(lt_t e, lt_t p, lt_t phase,
         }
         return set_rt_task_param(gettid(), &param);
 }
-#endif
 
 int init_kernel_iface(void);
 
diff --git a/src/syscalls.c b/src/syscalls.c
index 5885512..c68f15b 100644
--- a/src/syscalls.c
+++ b/src/syscalls.c
@@ -10,7 +10,6 @@
 
 #include "litmus.h"
 
-#if 0
 /*      Syscall stub for setting RT mode and scheduling options */
 
 pid_t gettid(void)
@@ -87,4 +86,3 @@ int null_call(cycles_t *timestamp)
 {
         return syscall(__NR_null_call, timestamp);
 }
-#endif