SOURCES (LINUX_2_6): linux-2.6-vs2.3.patch - suspend2 now not inte...

[zbyniu]

Author: zbyniu                       Date: Tue Oct  2 12:40:48 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- suspend2 now not intersect vs

---- Files affected:
SOURCES:
   linux-2.6-vs2.3.patch (1.2.4.11.2.9 -> 1.2.4.11.2.10) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.9 SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.10
--- SOURCES/linux-2.6-vs2.3.patch:1.2.4.11.2.9	Tue Oct  2 13:47:27 2007
+++ SOURCES/linux-2.6-vs2.3.patch	Tue Oct  2 14:40:42 2007
@@ -16815,9 +16815,9 @@
 --- linux-2.6.22.6/init/main.c	2007-07-09 13:20:03 +0200
 +++ linux-2.6.22.6-vs2.3.0.24/init/main.c	2007-08-05 20:53:13 +0200
 @@ -55,6 +55,7 @@
+ #include <linux/pid_namespace.h>
  #include <linux/device.h>
  #include <linux/kthread.h>
- #include <linux/suspend.h>
 +#include <linux/vserver/percpu.h>
  
  #include <asm/io.h>
@@ -17673,9 +17673,9 @@
 --- linux-2.6.22.6/kernel/printk.c	2007-07-09 13:20:03 +0200
 +++ linux-2.6.22.6-vs2.3.0.24/kernel/printk.c	2007-08-05 20:53:13 +0200
 @@ -31,6 +31,7 @@
+ #include <linux/bootmem.h>
  #include <linux/syscalls.h>
  #include <linux/jiffies.h>
- #include <linux/suspend.h>
 +#include <linux/vs_cvirt.h>
  
  #include <asm/uaccess.h>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-vs2.3.patch?r1=1.2.4.11.2.9&r2=1.2.4.11.2.10&f=u