git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm: don't call mark_page_accessed() in do_swap_page()
[safe/jmp/linux-2.6]
/
mm
/
oom_kill.c
diff --git
a/mm/oom_kill.c
b/mm/oom_kill.c
index
fd150e3
..
d3b9bac
100644
(file)
--- a/
mm/oom_kill.c
+++ b/
mm/oom_kill.c
@@
-55,7
+55,7
@@
static DEFINE_SPINLOCK(zone_scan_lock);
unsigned long badness(struct task_struct *p, unsigned long uptime)
{
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;
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;
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
/*
* Niced processes are most likely less important, so double
@@
-429,7
+427,6
@@
void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask)
unsigned long points = 0;
struct task_struct *p;
unsigned long points = 0;
struct task_struct *p;
- cgroup_lock();
read_lock(&tasklist_lock);
retry:
p = select_bad_process(&points, mem);
read_lock(&tasklist_lock);
retry:
p = select_bad_process(&points, mem);
@@
-444,7
+441,6
@@
retry:
goto retry;
out:
read_unlock(&tasklist_lock);
goto retry;
out:
read_unlock(&tasklist_lock);
- cgroup_unlock();
}
#endif
}
#endif