diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-15 09:35:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-11-15 09:35:33 -0800 |
| commit | 051b29f2798b5f1a95e745613117eeb367ab4bce (patch) | |
| tree | 0a219d6c96b27d757d23ff4d27b381cf07120cc9 /kernel | |
| parent | 8f98e292eb612956e1add401f28dc76ffea20323 (diff) | |
| parent | 25b3e5a3344e1f700c1efec5b6f0199f04707fb1 (diff) | |
| download | linux-051b29f2798b5f1a95e745613117eeb367ab4bce.tar.bz2 | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fix from Thomas Gleixner:
"A single fix to prevent math underflow in the numa balancing code"
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/numa: Fix math underflow in task_tick_numa()
Diffstat (limited to 'kernel')
| -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 824aa9f501a3..f04fda8f669c 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -2302,7 +2302,7 @@ void task_tick_numa(struct rq *rq, struct task_struct *curr) now = curr->se.sum_exec_runtime; period = (u64)curr->numa_scan_period * NSEC_PER_MSEC; - if (now - curr->node_stamp > period) { + if (now > curr->node_stamp + period) { if (!curr->node_stamp) curr->numa_scan_period = task_scan_min(curr); curr->node_stamp += period; |