2 files changed, 18 insertions, 6 deletions

diff --git a/kernel/exit.c b/kernel/exit.c
index 6c7699240327..8fd7acd7bbd0 100644
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -290,7 +290,7 @@ static void reparent_to_kthreadd(void)
         /* Set the exit signal to SIGCHLD so we signal init on exit */
         current->exit_signal = SIGCHLD;
 
-        if (!has_rt_policy(current) && (task_nice(current) < 0))
+        if (task_nice(current) < 0)
                 set_user_nice(current, 0);
         /* cpus_allowed? */
         /* rt_priority? */
diff --git a/kernel/sched.c b/kernel/sched.c
index d9ed9274bf0a..53c0ee742f69 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -220,6 +220,18 @@ static inline unsigned int task_timeslice(struct task_struct *p)
         return static_prio_timeslice(p->static_prio);
 }
 
+static inline int rt_policy(int policy)
+{
+        if (unlikely(policy == SCHED_FIFO) || unlikely(policy == SCHED_RR))
+                return 1;
+        return 0;
+}
+
+static inline int task_has_rt_policy(struct task_struct *p)
+{
+        return rt_policy(p->policy);
+}
+
 /*
  * This is the priority-queue data structure of the RT scheduling class:
  */
@@ -698,7 +710,7 @@ static inline int __normal_prio(struct task_struct *p)
 
 static void set_load_weight(struct task_struct *p)
 {
-        if (has_rt_policy(p)) {
+        if (task_has_rt_policy(p)) {
 #ifdef CONFIG_SMP
                 if (p == task_rq(p)->migration_thread)
                         /*
@@ -749,7 +761,7 @@ static inline int normal_prio(struct task_struct *p)
 {
         int prio;
 
-        if (has_rt_policy(p))
+        if (task_has_rt_policy(p))
                 prio = MAX_RT_PRIO-1 - p->rt_priority;
         else
                 prio = __normal_prio(p);
@@ -4051,7 +4063,7 @@ void set_user_nice(struct task_struct *p, long nice)
          * it wont have any effect on scheduling until the task is
          * not SCHED_NORMAL/SCHED_BATCH:
          */
-        if (has_rt_policy(p)) {
+        if (task_has_rt_policy(p)) {
                 p->static_prio = NICE_TO_PRIO(nice);
                 goto out_unlock;
         }
@@ -4240,14 +4252,14 @@ recheck:
             (p->mm && param->sched_priority > MAX_USER_RT_PRIO-1) ||
             (!p->mm && param->sched_priority > MAX_RT_PRIO-1))
                 return -EINVAL;
-        if (is_rt_policy(policy) != (param->sched_priority != 0))
+        if (rt_policy(policy) != (param->sched_priority != 0))
                 return -EINVAL;
 
         /*
          * Allow unprivileged RT tasks to decrease priority:
          */
         if (!capable(CAP_SYS_NICE)) {
-                if (is_rt_policy(policy)) {
+                if (rt_policy(policy)) {
                         unsigned long rlim_rtprio;
                         unsigned long flags;