Messages in this thread Patch in this message | | | From | Gregory Haskins <> | Subject | [PATCH 1/4] RT: Wrap the RQ notion of priority to make it conditional | Date | Tue, 16 Oct 2007 12:08:58 -0400 |
| |
A little cleanup to avoid #ifdef proliferation later in the series
Signed-off-by: Gregory Haskins <ghaskins@novell.com> ---
kernel/sched.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/kernel/sched.c b/kernel/sched.c index 0a1ad0e..1866a6e 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -365,6 +365,16 @@ struct rq { static DEFINE_PER_CPU_SHARED_ALIGNED(struct rq, runqueues); static DEFINE_MUTEX(sched_hotcpu_mutex); +#if defined(CONFIG_PREEMPT_RT) && defined(CONFIG_SMP) +static inline void set_rq_prio(struct rq *rq, int prio) +{ + rq->curr_prio = prio; +} + +#else +#define set_rq_prio(rq, prio) do { } while(0) +#endif + static inline void check_preempt_curr(struct rq *rq, struct task_struct *p) { rq->curr->sched_class->check_preempt_curr(rq, p); @@ -2331,9 +2341,9 @@ static inline void finish_task_switch(struct rq *rq, struct task_struct *prev) */ prev_state = prev->state; _finish_arch_switch(prev); -#if defined(CONFIG_PREEMPT_RT) && defined(CONFIG_SMP) - rq->curr_prio = current->prio; -#endif + + set_rq_prio(rq, current->prio); + finish_lock_switch(rq, prev); #if defined(CONFIG_PREEMPT_RT) && defined(CONFIG_SMP) /* - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |