git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
mm
/
oom_kill.c
diff --git
a/mm/oom_kill.c
b/mm/oom_kill.c
index
3de04b6
..
873b6db
100644
(file)
--- a/
mm/oom_kill.c
+++ b/
mm/oom_kill.c
@@
-221,7
+221,7
@@
retry:
/**
* out_of_memory - is the system out of memory?
*/
/**
* out_of_memory - is the system out of memory?
*/
-void out_of_memory(
int gfp_mask
)
+void out_of_memory(
void
)
{
/*
* oom_lock protects out_of_memory()'s static variables.
{
/*
* oom_lock protects out_of_memory()'s static variables.
@@
-272,9
+272,6
@@
void out_of_memory(int gfp_mask)
*/
lastkill = now;
*/
lastkill = now;
- printk("oom-killer: gfp_mask=0x%x\n", gfp_mask);
- show_free_areas();
-
/* oom_kill() sleeps */
spin_unlock(&oom_lock);
oom_kill();
/* oom_kill() sleeps */
spin_unlock(&oom_lock);
oom_kill();