diff options
Diffstat (limited to 'kernel/sched_rt.c')
-rw-r--r-- | kernel/sched_rt.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/kernel/sched_rt.c b/kernel/sched_rt.c index 299d012b4394..f2c66f8f9712 100644 --- a/kernel/sched_rt.c +++ b/kernel/sched_rt.c | |||
@@ -948,20 +948,15 @@ static int select_task_rq_rt(struct task_struct *p, int sync) | |||
948 | 948 | ||
949 | static void check_preempt_equal_prio(struct rq *rq, struct task_struct *p) | 949 | static void check_preempt_equal_prio(struct rq *rq, struct task_struct *p) |
950 | { | 950 | { |
951 | cpumask_var_t mask; | ||
952 | |||
953 | if (rq->curr->rt.nr_cpus_allowed == 1) | 951 | if (rq->curr->rt.nr_cpus_allowed == 1) |
954 | return; | 952 | return; |
955 | 953 | ||
956 | if (!alloc_cpumask_var(&mask, GFP_ATOMIC)) | ||
957 | return; | ||
958 | |||
959 | if (p->rt.nr_cpus_allowed != 1 | 954 | if (p->rt.nr_cpus_allowed != 1 |
960 | && cpupri_find(&rq->rd->cpupri, p, mask)) | 955 | && cpupri_find(&rq->rd->cpupri, p, NULL)) |
961 | goto free; | 956 | return; |
962 | 957 | ||
963 | if (!cpupri_find(&rq->rd->cpupri, rq->curr, mask)) | 958 | if (!cpupri_find(&rq->rd->cpupri, rq->curr, NULL)) |
964 | goto free; | 959 | return; |
965 | 960 | ||
966 | /* | 961 | /* |
967 | * There appears to be other cpus that can accept | 962 | * There appears to be other cpus that can accept |
@@ -970,8 +965,6 @@ static void check_preempt_equal_prio(struct rq *rq, struct task_struct *p) | |||
970 | */ | 965 | */ |
971 | requeue_task_rt(rq, p, 1); | 966 | requeue_task_rt(rq, p, 1); |
972 | resched_task(rq->curr); | 967 | resched_task(rq->curr); |
973 | free: | ||
974 | free_cpumask_var(mask); | ||
975 | } | 968 | } |
976 | 969 | ||
977 | #endif /* CONFIG_SMP */ | 970 | #endif /* CONFIG_SMP */ |