git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge HEAD from ../scsi-misc-2.6-old
[pandora-kernel.git]
/
mm
/
oom_kill.c
diff --git
a/mm/oom_kill.c
b/mm/oom_kill.c
index
5ec8da1
..
d348b90
100644
(file)
--- a/
mm/oom_kill.c
+++ b/
mm/oom_kill.c
@@
-263,7
+263,7
@@
static struct mm_struct *oom_kill_process(struct task_struct *p)
* OR try to be smart about which process to kill. Note that we
* don't have to be perfect here, we just have to be good.
*/
* OR try to be smart about which process to kill. Note that we
* don't have to be perfect here, we just have to be good.
*/
-void out_of_memory(
unsigned int __nocas
t gfp_mask, int order)
+void out_of_memory(
gfp_
t gfp_mask, int order)
{
struct mm_struct *mm = NULL;
task_t * p;
{
struct mm_struct *mm = NULL;
task_t * p;
@@
-300,6
+300,5
@@
retry:
* Give "p" a good chance of killing itself before we
* retry to allocate memory.
*/
* Give "p" a good chance of killing itself before we
* retry to allocate memory.
*/
- __set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(1);
+ schedule_timeout_interruptible(1);
}
}