Commit d1743b81 authored Jul 19, 2014 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:
 "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

parents cb20fd07 b0ab99e7

kernel/sched/debug.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -608,7 +608,7 @@ void proc_sched_show_task(struct task_struct p, struct seq_file m)

		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;