1 files changed, 1 insertions, 57 deletions

diff --git a/extra.h b/extra.h
index 8c894f6..3f1df9d 100644
--- a/extra.h
+++ b/extra.h
@@ -29,13 +29,8 @@ extern int sched_getcpu();
 #include <sys/syscall.h>
 #endif
 
-<<<<<<< HEAD
-#define LITMUS 1
-#define MC2 0
-=======
 // This is a proxy for "case study mode" now
-#define LITMUS 0
->>>>>>> rtas20-wip
+#define LITMUS 1
 #define MMDC_PROF 0
 
 #if LITMUS
@@ -269,57 +264,6 @@ static void _rt_load_params_itrl(int argc, char **argv) {
     mmdc->madpcr1 = axi_arm1;\
     msync(&(mmdc->madpcr1),4,MS_SYNC);
 
-<<<<<<< HEAD
-#define SETUP_LITMUS \
-    unsigned int wait = 0; \
-    if (be_migrate_to_domain(_rt_core) < 0) { \
-        perror("Unable to migrate to specified CPU"); \
-        exit(1); \
-    } \
-    struct rt_task rt_param; \
-    init_rt_task_param(&rt_param); \
-    /* Supposedly the next two parameters are irrelevant when reservations are enabled, but I'm leaving them anyway... */ \
-    rt_param.exec_cost = ms2ns(999); \
-    rt_param.period = ms2ns(1000); \
-    rt_param.priority = LITMUS_HIGHEST_PRIORITY; \
-    rt_param.cls = RT_CLASS_HARD; \
-    rt_param.release_policy = TASK_PERIODIC; \
-    rt_param.budget_policy = NO_ENFORCEMENT; \
-    rt_param.cpu = _rt_core; \
-    if (set_rt_task_param(gettid(), &rt_param) < 0) { \
-        perror("Unable to set real-time parameters"); \
-        exit(1); \
-    } \
-    if (init_litmus() != 0) { \
-        perror("init_litmus failed"); \
-        exit(1); \
-    } \
-    MC2_SETUP \
-    if (task_mode(LITMUS_RT_TASK) != 0) { \
-        perror("Unable to become real-time task"); \
-        exit(1); \
-    } \
-    if (wait && wait_for_ts_release() != 0) { \
-        perror("Unable to wait for taskset release"); \
-        exit(1); \
-    }
-
-#if MC2
-#define MC2_SETUP \
-
-    set_page_color(rt_param.cpu);
-#else
-#define MC2_SETUP
-#endif
-
-#define CLEANUP_LITMUS \
-    if (task_mode(BACKGROUND_TASK) != 0) { \
-        perror("Unable to become a real-time task"); \
-        exit(1); \
-    } \
-
-=======
->>>>>>> rtas20-wip
 #if __arm__
 // On ARM, manually flush the cache
 #define FLUSH_CACHES \