vserver 2.0 rc7

[linux-2.6.git] / mm / oom_kill.c

diff --git a/mm/oom_kill.c b/mm/oom_kill.c
index 3c9040a..45d7902 100644 (file)
--- a/mm/oom_kill.c
+++ b/mm/oom_kill.c
@@ -146,7 +146,7 @@ static struct task_struct * select_bad_process(void)
        do_posix_clock_monotonic_gettime(&uptime);
        do_each_thread(g, p)
                /* skip the init task with pid == 1 */
-               if (p->pid > 1) {
+               if (p->pid > 1 && p->oomkilladj != OOM_DISABLE) {
                        unsigned long points;
 
                        /*
@@ -254,7 +254,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.
  */
-void out_of_memory(int gfp_mask)
+void out_of_memory(unsigned int __nocast gfp_mask)
 {
        struct mm_struct *mm = NULL;
        task_t * p;