Commit 051b29f2 authored Nov 15, 2015 by Linus Torvalds

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()

parents 8f98e292 25b3e5a3

kernel/sched/fair.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;