| From 596f507f99c4286e37720c399c2137379ecb284b Mon Sep 17 00:00:00 2001 |
| From: Paul Gortmaker <paul.gortmaker@windriver.com> |
| Date: Sun, 23 Jan 2011 11:14:42 -0500 |
| Subject: [PATCH] sched_rt: increase prio checks from WARN_ON to BUG_ON |
| |
| This is one of several extractions from the merge up to 33-rc8. |
| |
| See it in a git tip repo with: |
| |
| git diff 5f854cfc024622e4aae14d7cf422f6ff86278688^2 \ |
| 5f854cfc024622e4aae14d7cf422f6ff86278688 kernel/sched_rt.c |
| |
| You can find the origin of this change in the tip merge commit: |
| |
| commit 5f854cfc024622e4aae14d7cf422f6ff86278688 |
| Merge: cc24da0 4ec62b2 |
| Author: Thomas Gleixner <tglx@linutronix.de> |
| Date: Sun Feb 21 20:17:22 2010 +0100 |
| |
| Forward to 2.6.33-rc8 |
| |
| Merge branch 'linus' into rt/head with a pile of conflicts. |
| |
| Signed-off-by: Thomas Gleixner <tglx@linutronix.de> |
| |
| Normally there are not significant changes/additions in a merge commit that |
| are not from any other "normal" commit. But in this case there are, so |
| break them out into separate explicit commits. |
| |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c |
| index 40ca364..9204fe1 100644 |
| --- a/kernel/sched_rt.c |
| +++ b/kernel/sched_rt.c |
| @@ -783,7 +783,7 @@ void inc_rt_tasks(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq) |
| { |
| int prio = rt_se_prio(rt_se); |
| |
| - WARN_ON(!rt_prio(prio)); |
| + BUG_ON(!rt_prio(prio)); |
| rt_rq->rt_nr_running++; |
| |
| inc_rt_prio(rt_rq, prio); |
| @@ -794,7 +794,7 @@ void inc_rt_tasks(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq) |
| static inline |
| void dec_rt_tasks(struct sched_rt_entity *rt_se, struct rt_rq *rt_rq) |
| { |
| - WARN_ON(!rt_prio(rt_se_prio(rt_se))); |
| + BUG_ON(!rt_prio(rt_se_prio(rt_se))); |
| WARN_ON(!rt_rq->rt_nr_running); |
| rt_rq->rt_nr_running--; |
| |
| -- |
| 1.7.1.1 |
| |