diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-08 11:59:57 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-08 11:59:57 +0200 |
| commit | bb2ebf08869c4404dc2f8fb6fe3e4b6b00bb40ad (patch) | |
| tree | 9bd871abc2f4d19dc3c0d0e9cbecef795d79981b /include/linux/sched/rt.h | |
| parent | 6a82b60da26bc404a8fca242521d988c437d0611 (diff) | |
| parent | 533445c6e53368569e50ab3fb712230c03d523f3 (diff) | |
Merge branch 'sched/urgent' into sched/core, before applying new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/sched/rt.h')
| -rw-r--r-- | include/linux/sched/rt.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/sched/rt.h b/include/linux/sched/rt.h index 6341f5be6e24..a30b172df6e1 100644 --- a/include/linux/sched/rt.h +++ b/include/linux/sched/rt.h @@ -18,7 +18,7 @@ static inline int rt_task(struct task_struct *p) #ifdef CONFIG_RT_MUTEXES extern int rt_mutex_getprio(struct task_struct *p); extern void rt_mutex_setprio(struct task_struct *p, int prio); -extern int rt_mutex_check_prio(struct task_struct *task, int newprio); +extern int rt_mutex_get_effective_prio(struct task_struct *task, int newprio); extern struct task_struct *rt_mutex_get_top_task(struct task_struct *task); extern void rt_mutex_adjust_pi(struct task_struct *p); static inline bool tsk_is_pi_blocked(struct task_struct *tsk) @@ -31,9 +31,10 @@ static inline int rt_mutex_getprio(struct task_struct *p) return p->normal_prio; } -static inline int rt_mutex_check_prio(struct task_struct *task, int newprio) +static inline int rt_mutex_get_effective_prio(struct task_struct *task, + int newprio) { - return 0; + return newprio; } static inline struct task_struct *rt_mutex_get_top_task(struct task_struct *task) |