diff options
Diffstat (limited to 'kernel/sched_fair.c')
-rw-r--r-- | kernel/sched_fair.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index b554e63c521a..007958e3c93a 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c | |||
@@ -1331,13 +1331,14 @@ find_idlest_cpu(struct sched_group *group, struct task_struct *p, int this_cpu) | |||
1331 | * | 1331 | * |
1332 | * preempt must be disabled. | 1332 | * preempt must be disabled. |
1333 | */ | 1333 | */ |
1334 | static int select_task_rq_fair(struct task_struct *p, int sd_flag, int sync) | 1334 | static int select_task_rq_fair(struct task_struct *p, int sd_flag, int flags) |
1335 | { | 1335 | { |
1336 | struct sched_domain *tmp, *sd = NULL; | 1336 | struct sched_domain *tmp, *sd = NULL; |
1337 | int cpu = smp_processor_id(); | 1337 | int cpu = smp_processor_id(); |
1338 | int prev_cpu = task_cpu(p); | 1338 | int prev_cpu = task_cpu(p); |
1339 | int new_cpu = cpu; | 1339 | int new_cpu = cpu; |
1340 | int want_affine = 0; | 1340 | int want_affine = 0; |
1341 | int sync = flags & WF_SYNC; | ||
1341 | 1342 | ||
1342 | if (sd_flag & SD_BALANCE_WAKE) { | 1343 | if (sd_flag & SD_BALANCE_WAKE) { |
1343 | if (sched_feat(AFFINE_WAKEUPS)) | 1344 | if (sched_feat(AFFINE_WAKEUPS)) |
@@ -1548,11 +1549,12 @@ static void set_next_buddy(struct sched_entity *se) | |||
1548 | /* | 1549 | /* |
1549 | * Preempt the current task with a newly woken task if needed: | 1550 | * Preempt the current task with a newly woken task if needed: |
1550 | */ | 1551 | */ |
1551 | static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int sync) | 1552 | static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int flags) |
1552 | { | 1553 | { |
1553 | struct task_struct *curr = rq->curr; | 1554 | struct task_struct *curr = rq->curr; |
1554 | struct sched_entity *se = &curr->se, *pse = &p->se; | 1555 | struct sched_entity *se = &curr->se, *pse = &p->se; |
1555 | struct cfs_rq *cfs_rq = task_cfs_rq(curr); | 1556 | struct cfs_rq *cfs_rq = task_cfs_rq(curr); |
1557 | int sync = flags & WF_SYNC; | ||
1556 | 1558 | ||
1557 | update_curr(cfs_rq); | 1559 | update_curr(cfs_rq); |
1558 | 1560 | ||