Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a12888f7 authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Linus Torvalds
Browse files

oom_kill: don't call for int_sqrt(0) 



There is no need to call for int_sqrt if argument is 0.

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@openvz.org>
Cc: Pekka Enberg <penberg@cs.helsinki.fi>
Cc: Christoph Lameter <cl@linux-foundation.org>
Acked-by: default avatarDavid Rientjes <rientjes@google.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d086817d

mm/oom_kill.c

+5 −7
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ static DEFINE_SPINLOCK(zone_scan_lock); 


unsigned long badness(struct task_struct *p, unsigned long uptime)

{

	unsigned long points, cpu_time, run_time, s;

	unsigned long points, cpu_time, run_time;

	struct mm_struct *mm;

	struct task_struct *child;
@@ -110,12 +110,10 @@ unsigned long badness(struct task_struct *p, unsigned long uptime) 
	else

		run_time = 0;



	s = int_sqrt(cpu_time);

	if (s)

		points /= s;

	s = int_sqrt(int_sqrt(run_time));

	if (s)

		points /= s;

	if (cpu_time)

		points /= int_sqrt(cpu_time);

	if (run_time)

		points /= int_sqrt(int_sqrt(run_time));



	/*

	 * Niced processes are most likely less important, so double