X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=kernel%2Fsched%2Fcpudeadline.c;fp=kernel%2Fsched%2Fcpudeadline.c;h=5b9bb42b2d47e760f3a7cd17af24ba37d2cf07ea;hb=eec751ed41a0ae7e92a43c33a458d7bd1b941631;hp=5b8838b56d1c8dee47354f3a1a697263678d00ea;hpb=3908ac13b550c93f97d8db136ff572be5495bc06;p=~andy%2Flinux diff --git a/kernel/sched/cpudeadline.c b/kernel/sched/cpudeadline.c index 5b8838b56d1..5b9bb42b2d4 100644 --- a/kernel/sched/cpudeadline.c +++ b/kernel/sched/cpudeadline.c @@ -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; }