From ffce8e6956867e6f7efbce5dcaf5ab356c03907c Mon Sep 17 00:00:00 2001
From: Matthieu Schaller <matthieu.schaller@durhama.ac.uk>
Date: Fri, 11 Dec 2015 13:14:56 +0000
Subject: [PATCH] Corrected merge bug in scheduler_done()

---
 src/scheduler.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/scheduler.c b/src/scheduler.c
index 8cdc4b0f9c..6ef8317970 100644
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -1134,10 +1134,6 @@ void scheduler_enqueue(struct scheduler *s, struct task *t) {
 
 struct task *scheduler_done(struct scheduler *s, struct task *t) {
 
-  int k, res;
-  struct task *t2, *next = NULL;
-  struct cell *super = t->ci->super;
-
   /* Release whatever locks this task held. */
   if (!t->implicit) task_unlock(t);
 
-- 
GitLab