2 files changed, 4 insertions, 5 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 503dea61ff99..fbc69cc3923d 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -504,8 +504,8 @@ struct signal_struct {
 #define rt_prio(prio)           unlikely((prio) < MAX_RT_PRIO)
 #define rt_task(p)              rt_prio((p)->prio)
 #define batch_task(p)           (unlikely((p)->policy == SCHED_BATCH))
-#define has_rt_policy(p) \
-        unlikely((p)->policy != SCHED_NORMAL && (p)->policy != SCHED_BATCH)
+#define is_rt_policy(p)         ((p) != SCHED_NORMAL && (p) != SCHED_BATCH)
+#define has_rt_policy(p)        unlikely(is_rt_policy((p)->policy))
 
 /*
  * Some day this will be a full-fledged user tracking system..
diff --git a/kernel/sched.c b/kernel/sched.c
index f9b3c6a414f1..c3c718aea618 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -4109,8 +4109,7 @@ recheck:
             (p->mm && param->sched_priority > MAX_USER_RT_PRIO-1) ||
             (!p->mm && param->sched_priority > MAX_RT_PRIO-1))
                 return -EINVAL;
-        if ((policy == SCHED_NORMAL || policy == SCHED_BATCH)
-                                        != (param->sched_priority == 0))
+        if (is_rt_policy(policy) != (param->sched_priority != 0))
                 return -EINVAL;
 
         /*
@@ -4134,7 +4133,7 @@ recheck:
                                 !rlim_rtprio)
                         return -EPERM;
                 /* can't increase priority */
-                if ((policy != SCHED_NORMAL && policy != SCHED_BATCH) &&
+                if (is_rt_policy(policy) &&
                     param->sched_priority > p->rt_priority &&
                     param->sched_priority > rlim_rtprio)
                         return -EPERM;