Skip to contentSkip to conversation

sched/deadline: Switch CPU's presence test order

PATCH New Juri Lelli 2 participants 2 messages Feb 24, 2014 – Feb 27, 2014 Scheduler

lore
Share & tools
lore

Juri Lelli

author
#0 lore raw

PATCH 1/1 sched/deadline: Switch CPU's presence test order

Commit 82b9580 (sched/deadline: Test for CPU's presence explicitly) changed how we check if a CPU returned by cpudeadline machinery is valid. But, we don't want to call cpu_present() if best_cpu is equal to -1. So, switch the order of tests inside WARN_ON().

---
 kernel/sched/cpudeadline.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/sched/cpudeadline.c +2 -2
index 5b8838b..5b9bb42 100644
@@ -70,7 +70,7 @@ static void cpudl_heapify(struct cpudl *cp, int idx)
 
 static void cpudl_change_key(struct cpudl *cp, int idx, u64 new_dl)
 {
-	WARN_ON(!cpu_present(idx) || idx == IDX_INVALID);
+	WARN_ON(idx == IDX_INVALID || !cpu_present(idx));
 
 	if (dl_time_before(new_dl, cp->elements[idx].dl)) {
 		cp->elements[idx].dl = new_dl;
@@ -117,7 +117,7 @@ int cpudl_find(struct cpudl *cp, struct task_struct *p,
 	}
 
 out:
-	WARN_ON(!cpu_present(best_cpu) && best_cpu != -1);
+	WARN_ON(best_cpu != -1 && !cpu_present(best_cpu));
 
 	return best_cpu;
 }
Signature · 1 line
1.7.9.5
#1 lore raw

[tip:sched/urgent] sched/deadline: Switch CPU' s presence test order

sched/deadline: Switch CPU's presence test order
Commit-ID:  eec751ed41a0ae7e92a43c33a458d7bd1b941631
Gitweb:     http://git.kernel.org/tip/eec751ed41a0ae7e92a43c33a458d7bd1b941631
Author:     Juri Lelli <[email protected]>
AuthorDate: Mon, 24 Feb 2014 11:47:12 +0100
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 27 Feb 2014 12:29:40 +0100

sched/deadline: Switch CPU's presence test order

Commit 82b9580 ("sched/deadline: Test for CPU's presence explicitly") changed how we check if a CPU returned by cpudeadline machinery is valid. But, we don't want to call cpu_present() if best_cpu is equal to -1. So, switch the order of tests inside WARN_ON().

---
 kernel/sched/cpudeadline.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/sched/cpudeadline.c +2 -2
index 5b8838b..5b9bb42 100644
@@ -70,7 +70,7 @@ static void cpudl_heapify(struct cpudl *cp, int idx)
 
 static void cpudl_change_key(struct cpudl *cp, int idx, u64 new_dl)
 {
-	WARN_ON(!cpu_present(idx) || idx == IDX_INVALID);
+	WARN_ON(idx == IDX_INVALID || !cpu_present(idx));
 
 	if (dl_time_before(new_dl, cp->elements[idx].dl)) {
 		cp->elements[idx].dl = new_dl;
@@ -117,7 +117,7 @@ int cpudl_find(struct cpudl *cp, struct task_struct *p,
 	}
 
 out:
-	WARN_ON(!cpu_present(best_cpu) && best_cpu != -1);
+	WARN_ON(best_cpu != -1 && !cpu_present(best_cpu));
 
 	return best_cpu;
 }