From a61ffc11d56ada4c466ff02b18e9c757c46399a7 Mon Sep 17 00:00:00 2001
From: meto <meto@zedat.fu-berlin.de>
Date: Mon, 18 Mar 2019 11:52:09 +0100
Subject: [PATCH] fixes

---
 kernel/sched/pb.c                   | 6 ++----
 kernel/sched/perf_error_detection.c | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/kernel/sched/pb.c b/kernel/sched/pb.c
index e5492c36c1cd..d6fcc675cfcf 100644
--- a/kernel/sched/pb.c
+++ b/kernel/sched/pb.c
@@ -115,8 +115,6 @@ static struct task_struct * pick_next_task_pb(struct rq *rq,
 	next_mode = determine_next_mode_pb(rq);
 	pb->mode = next_mode;
 
-	int perf_init_res;
-
 	// The mode does not change --> no behavior change is needed
 	if (next_mode == PB_EXEC_MODE)
 	{
@@ -131,7 +129,7 @@ static struct task_struct * pick_next_task_pb(struct rq *rq,
 				printk(KERN_DEBUG "PLAN DONE\n");
 				pb->mode = PB_DISABLED_MODE;
 			}else{
-				perf_init_res = init_perf_event(pb->plan[pb->c_entry], &pb->pevent);
+				int perf_init_res = init_perf_event(pb->plan[pb->c_entry], &pb->pevent);
 				if(perf_init_res < 0){
 					//initialization error detection/handling could happen here
 					printk(KERN_WARNING "PB EXEC,START,%u,%llu: FAILED OPEN PERF EVENT\n", pb->c_entry, sched_clock());
@@ -143,7 +141,7 @@ static struct task_struct * pick_next_task_pb(struct rq *rq,
 		}else if(current_mode == PB_ADMIN_MODE){
 			printk(KERN_DEBUG "PB ADMIN,STOP,%u,%llu\n", pb->c_entry, sched_clock());
 		}else{
-			perf_init_res = init_perf_event(pb->plan[pb->c_entry], &pb->pevent);
+			int perf_init_res = init_perf_event(pb->plan[pb->c_entry], &pb->pevent);
 
 			if(perf_init_res < 0){
 				//initialization error detection/handling could happen here
diff --git a/kernel/sched/perf_error_detection.c b/kernel/sched/perf_error_detection.c
index a96b57aa69a0..2e8b78163779 100644
--- a/kernel/sched/perf_error_detection.c
+++ b/kernel/sched/perf_error_detection.c
@@ -22,7 +22,7 @@ int init_perf_event(struct plan_entry plan_entry, struct perf_event **pevent){
 	// cpu = -1 -> cpu indepented (assumed to be regulated by plan)
 	*pevent = perf_event_create(&pe, smp_processor_id());
 
-	if (IS_ERR(event)) {
+	if (IS_ERR(pevent)) {
 			printk(KERN_WARNING "PB ERROR INITIALISING PERF EVENT\n");
 			return -1;
 	}
-- 
GitLab