Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 191391
b: refs/heads/master
c: f2e74ee
h: refs/heads/master
i:
  191389: 7db3d62
  191387: f7aa55e
  191383: 51febc5
  191375: 16524d5
  191359: e5ddf3a
v: v3
  • Loading branch information
Mike Galbraith authored and Ingo Molnar committed Mar 11, 2010
1 parent 9f6b297 commit be89796
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5ca9880c6f4ba4c84b517bc2fed5366adf63d191
refs/heads/master: f2e74eeac03ffb779d64b66a643c5e598145a28b
4 changes: 0 additions & 4 deletions trunk/kernel/sched_fair.c
Original file line number Diff line number Diff line change
Expand Up @@ -1658,7 +1658,6 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
struct task_struct *curr = rq->curr;
struct sched_entity *se = &curr->se, *pse = &p->se;
struct cfs_rq *cfs_rq = task_cfs_rq(curr);
int sync = wake_flags & WF_SYNC;
int scale = cfs_rq->nr_running >= sched_nr_latency;

if (unlikely(rt_prio(p->prio)))
Expand Down Expand Up @@ -1691,9 +1690,6 @@ static void check_preempt_wakeup(struct rq *rq, struct task_struct *p, int wake_
if (unlikely(curr->policy == SCHED_IDLE))
goto preempt;

if (sched_feat(WAKEUP_SYNC) && sync)
goto preempt;

if (!sched_feat(WAKEUP_PREEMPT))
return;

Expand Down
5 changes: 0 additions & 5 deletions trunk/kernel/sched_features.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@ SCHED_FEAT(WAKEUP_PREEMPT, 1)
*/
SCHED_FEAT(ASYM_GRAN, 1)

/*
* Always wakeup-preempt SYNC wakeups, see SYNC_WAKEUPS.
*/
SCHED_FEAT(WAKEUP_SYNC, 0)

/*
* Use the SYNC wakeup hint, pipes and the likes use this to indicate
* the remote end is likely to consume the data we just wrote, and
Expand Down

0 comments on commit be89796

Please sign in to comment.