diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-30 10:38:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-30 10:38:30 +0200 |
| commit | 39675e89fb472c1b9c8e740e00acb1df2bbc6be7 (patch) | |
| tree | cce6814d3e7c62adf59e565fb6ae95fd409f86ab /kernel/sched_fair.c | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
| parent | 2c3d103ba90827cfb478bf10464d9b5b9cea369c (diff) | |
| download | op-kernel-dev-39675e89fb472c1b9c8e740e00acb1df2bbc6be7.zip op-kernel-dev-39675e89fb472c1b9c8e740e00acb1df2bbc6be7.tar.gz | |
Merge branch 'sched/urgent' into sched/clock
Diffstat (limited to 'kernel/sched_fair.c')
| -rw-r--r-- | kernel/sched_fair.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched_fair.c b/kernel/sched_fair.c index cf2cd6c..0fe94ea 100644 --- a/kernel/sched_fair.c +++ b/kernel/sched_fair.c @@ -899,7 +899,7 @@ static void hrtick_start_fair(struct rq *rq, struct task_struct *p) * doesn't make sense. Rely on vruntime for fairness. */ if (rq->curr != p) - delta = max(10000LL, delta); + delta = max_t(s64, 10000LL, delta); hrtick_start(rq, delta); } |
