-
-; fixup
-diff -NurpP --exclude '*.orig' --exclude '*.rej' linux-2.6.27.10-vs2.3.x-PS-02.0/mm/oom_kill.c linux-2.6.27.10-vs2.3.x-PS-02.1/mm/oom_kill.c
---- linux-2.6.27.10-vs2.3.x-PS-02.0/mm/oom_kill.c 2009-01-25 02:29:32.000000000 +0100
-+++ linux-2.6.27.10-vs2.3.x-PS-02.1/mm/oom_kill.c 2009-01-25 02:05:07.000000000 +0100
-@@ -454,6 +454,7 @@ out:
- read_unlock(&tasklist_lock);
- cgroup_unlock();
- }
-+
- #endif
-
- static BLOCKING_NOTIFIER_HEAD(oom_notify_list);
-@@ -519,6 +520,7 @@ void clear_zonelist_oom(struct zonelist
- }
- spin_unlock(&zone_scan_mutex);
- }
-+EXPORT_SYMBOL_GPL(clear_zonelist_oom);
-
- /**
- * out_of_memory - kill the "best" process when we run out of memory
-@@ -635,4 +637,14 @@ void out_of_memory(struct zonelist *zone
- }
- spin_unlock(&oom_lock);
- }
-+
-+#ifdef CONFIG_CGROUP_MEM_RES_CTLR
-+void mem_cgroup_out_of_memory(struct mem_cgroup *mem, gfp_t gfp_mask)
-+{
-+ cgroup_lock();
-+ panic("Memory cgroup out Of Memory");
-+ cgroup_unlock();
-+}
-+
-+#endif
- #endif /* CONFIG_OOM_PANIC */
-diff -NurpP --exclude '*.orig' --exclude '*.rej' linux-2.6.27.10-vs2.3.x-PS-02.0/mm/page_alloc.c linux-2.6.27.10-vs2.3.x-PS-02.1/mm/page_alloc.c
---- linux-2.6.27.10-vs2.3.x-PS-02.0/mm/page_alloc.c 2008-12-19 12:09:14.000000000 +0100
-+++ linux-2.6.27.10-vs2.3.x-PS-02.1/mm/page_alloc.c 2009-01-25 00:37:42.000000000 +0100
-@@ -1583,11 +1583,12 @@ nofail_alloc:
+Index: linux-2.6.27.y/mm/page_alloc.c
+===================================================================
+--- linux-2.6.27.y.orig/mm/page_alloc.c
++++ linux-2.6.27.y/mm/page_alloc.c
+@@ -1588,11 +1588,12 @@ nofail_alloc: