commit d1743b810d7a306d1dd837e086d18124bc38b575
author Linus Torvalds <torvalds@linux-foundation.org> Sat Jul 19 06:26:43 2014 -1000
committer Linus Torvalds <torvalds@linux-foundation.org> Sat Jul 19 06:26:43 2014 -1000
tree 30e33a166f2f501a1e6ac0be96c0636d98d16711
parent cb20fd0779add7c5b6dd7ca6f5e2aa2c0d06803f
parent b0ab99e7736af88b8ac1b7ae50ea287fffa2badc

Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull scheduler fix from Thomas Gleixner:
 "Prevent a possible divide by zero in the debugging code"

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched: Fix possible divide by zero in avg_atom() calculation

kernel/sched/debug.c

diff --git a/kernel/sched/debug.c b/kernel/sched/debug.c
index 695f977..627b3c3 100644
--- a/kernel/sched/debug.c
+++ b/kernel/sched/debug.c
@@ -608,7 +608,7 @@
 
 		avg_atom = p->se.sum_exec_runtime;
 		if (nr_switches)
-			do_div(avg_atom, nr_switches);
+			avg_atom = div64_ul(avg_atom, nr_switches);
 		else
 			avg_atom = -1LL;