SOURCES (LINUX_2_6): linux-2.6-vs2.2.patch - suspend2 related chan...

[mguevara]

Author: mguevara                     Date: Thu May  3 21:20:16 2007 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- suspend2 related changes and extraversion change removal

---- Files affected:
SOURCES:
   linux-2.6-vs2.2.patch (1.1.4.1 -> 1.1.4.2) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.2.patch
diff -u SOURCES/linux-2.6-vs2.2.patch:1.1.4.1 SOURCES/linux-2.6-vs2.2.patch:1.1.4.2
--- SOURCES/linux-2.6-vs2.2.patch:1.1.4.1	Thu May  3 14:52:46 2007
+++ SOURCES/linux-2.6-vs2.2.patch	Thu May  3 23:20:10 2007
@@ -156,18 +156,6 @@
 + m 2^m	"vx_acc_page[%5d,%s,%2d]: %5d%s"
 +	"vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
 +	"vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
-diff -NurpP --minimal linux-2.6.21/Makefile linux-2.6.21-vs2.2.0-rc1/Makefile
---- linux-2.6.21/Makefile	2007-05-02 19:24:16 +0200
-+++ linux-2.6.21-vs2.2.0-rc1/Makefile	2007-05-03 02:35:23 +0200
-@@ -1,7 +1,7 @@
- VERSION = 2
- PATCHLEVEL = 6
- SUBLEVEL = 21
--EXTRAVERSION =
-+EXTRAVERSION = -vs2.2.0-rc1
- NAME = Nocturnal Monster Puppy
- 
- # *DOCUMENTATION*
 diff -NurpP --minimal linux-2.6.21/arch/alpha/Kconfig linux-2.6.21-vs2.2.0-rc1/arch/alpha/Kconfig
 --- linux-2.6.21/arch/alpha/Kconfig	2007-05-02 19:24:16 +0200
 +++ linux-2.6.21-vs2.2.0-rc1/arch/alpha/Kconfig	2007-05-02 20:40:17 +0200
@@ -15875,9 +15863,9 @@
 --- linux-2.6.21/init/main.c	2007-05-02 19:25:37 +0200
 +++ linux-2.6.21-vs2.2.0-rc1/init/main.c	2007-05-02 20:40:17 +0200
 @@ -54,6 +54,7 @@
- #include <linux/lockdep.h>
  #include <linux/pid_namespace.h>
  #include <linux/device.h>
+ #include <linux/suspend.h>
 +#include <linux/vserver/percpu.h>
  
  #include <asm/io.h>
@@ -16590,9 +16578,9 @@
 --- linux-2.6.21/kernel/printk.c	2007-05-02 19:25:37 +0200
 +++ linux-2.6.21-vs2.2.0-rc1/kernel/printk.c	2007-05-02 20:40:18 +0200
 @@ -32,6 +32,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>
@@ -17918,9 +17906,9 @@
 --- linux-2.6.21/kernel/timer.c	2007-05-02 19:25:37 +0200
 +++ linux-2.6.21-vs2.2.0-rc1/kernel/timer.c	2007-05-02 22:36:07 +0200
 @@ -36,6 +36,10 @@
- #include <linux/delay.h>
  #include <linux/tick.h>
  #include <linux/kallsyms.h>
+ #include <linux/freezer.h>
 +#include <linux/vs_base.h>
 +#include <linux/vs_cvirt.h>
 +#include <linux/vs_pid.h>
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/linux-2.6-vs2.2.patch?r1=1.1.4.1&r2=1.1.4.2&f=u