SOURCES (LINUX_2_6): linux-2.6-vs2.1.patch - apply over suspend2

[baggins]

Author: baggins                      Date: Fri May  5 13:23:43 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- apply over suspend2

---- Files affected:
SOURCES:
   linux-2.6-vs2.1.patch (1.1.2.20 -> 1.1.2.21) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.1.patch
diff -u SOURCES/linux-2.6-vs2.1.patch:1.1.2.20 SOURCES/linux-2.6-vs2.1.patch:1.1.2.21
--- SOURCES/linux-2.6-vs2.1.patch:1.1.2.20	Thu May  4 00:25:13 2006
+++ SOURCES/linux-2.6-vs2.1.patch	Fri May  5 15:23:37 2006
@@ -19536,9 +19536,9 @@
 --- linux-2.6.16.13/kernel/timer.c	2006-04-09 13:49:58 +0200
 +++ linux-2.6.16.13-vs2.1.1-rc19/kernel/timer.c	2006-04-26 19:07:00 +0200
 @@ -34,6 +34,9 @@
- #include <linux/cpu.h>
  #include <linux/syscalls.h>
  #include <linux/delay.h>
+ #include <linux/freezer.h>
 +#include <linux/vs_cvirt.h>
 +#include <linux/vs_pid.h>
 +#include <linux/vserver/sched.h>
@@ -27336,9 +27336,9 @@
 --- linux-2.6.16.13/mm/page_alloc.c	2006-05-03 16:59:02 +0200
 +++ linux-2.6.16.13-vs2.1.1-rc19/mm/page_alloc.c	2006-04-26 19:07:00 +0200
 @@ -37,6 +37,7 @@
- #include <linux/nodemask.h>
  #include <linux/vmalloc.h>
  #include <linux/mempolicy.h>
+ #include <linux/freezer.h>
 +#include <linux/vs_limit.h>
  
  #include <asm/tlbflush.h>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.1.patch?r1=1.1.2.20&r2=1.1.2.21&f=u