SOURCES (LINUX_2_6_20): linux-2.6-vs2.3.patch - fix for mm/oom_kill.c

[mguevara]

Author: mguevara                     Date: Wed Jan 17 09:19:57 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6_20
---- Log message:
- fix for mm/oom_kill.c

---- Files affected:
SOURCES:
   linux-2.6-vs2.3.patch (1.2.2.33 -> 1.2.2.34) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.2.33 SOURCES/linux-2.6-vs2.3.patch:1.2.2.34
--- SOURCES/linux-2.6-vs2.3.patch:1.2.2.33	Wed Jan 17 02:02:13 2007
+++ SOURCES/linux-2.6-vs2.3.patch	Wed Jan 17 10:19:51 2007
@@ -29294,28 +29294,27 @@
  #endif
  	return points;
  }
-@@ -279,8 +286,8 @@ static void __oom_kill_task(struct task_
+@@ -284,7 +291,8 @@ static void __oom_kill_task(struct task_
  	}
  
- 	if (message) {
--		printk(KERN_ERR "%s: Killed process %d (%s).\n",
--				message, p->pid, p->comm);
-+		printk(KERN_ERR "%s: Killed process %d:#%u (%s).\n",
-+				message, p->pid, p->xid, p->comm);
- 	}
+ 	if (verbose)
+-		printk(KERN_ERR "Killed process %d (%s)\n", p->pid, p->comm);
++		printk(KERN_ERR "Killed process %d:#%u (%s).\n",
++				p->pid, p->xid, p->comm);
  
  	/*
-@@ -341,8 +348,8 @@ static int oom_kill_process(struct task_
+ 	 * We give our sacrificial lamb high priority and access to
+@@ -354,8 +362,8 @@ static int oom_kill_process(struct task_
  		return 0;
  	}
  
--	printk(KERN_ERR "Out of Memory: Kill process %d (%s) score %li"
--			" and children.\n", p->pid, p->comm, points);
-+	printk(KERN_ERR "Out of Memory: Kill process %d:#%u (%s) score %li"
-+			" and children.\n", p->pid, p->xid, p->comm, points);
+-	printk(KERN_ERR "%s: kill process %d (%s) score %li or a child\n",
+-					message, p->pid, p->comm, points);
++	printk(KERN_ERR "%s: kill process %d:#%u (%s) score %li or a child\n",
++			message, p->pid, p->xid, p->comm, points);
+ 
  	/* Try to kill a child first */
  	list_for_each(tsk, &p->children) {
- 		c = list_entry(tsk, struct task_struct, sibling);
 diff -NurpP --minimal linux-2.6.19.1/mm/page_alloc.c linux-2.6.19.1-vs2.3.0.6/mm/page_alloc.c
 --- linux-2.6.19.1/mm/page_alloc.c	2006-11-30 21:19:44 +0100
 +++ linux-2.6.19.1-vs2.3.0.6/mm/page_alloc.c	2006-11-30 20:55:45 +0100
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.3.patch?r1=1.2.2.33&r2=1.2.2.34&f=u