SOURCES (LINUX_2_6): linux-2.6-vs2.1.patch - make it independent o...

[zbyniu]

Author: zbyniu                       Date: Fri Sep 29 14:27:55 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- make it independent of suspend2

---- Files affected:
SOURCES:
   linux-2.6-vs2.1.patch (1.1.2.35 -> 1.1.2.36) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.1.patch
diff -u SOURCES/linux-2.6-vs2.1.patch:1.1.2.35 SOURCES/linux-2.6-vs2.1.patch:1.1.2.36
--- SOURCES/linux-2.6-vs2.1.patch:1.1.2.35	Thu Sep 28 02:28:15 2006
+++ SOURCES/linux-2.6-vs2.1.patch	Fri Sep 29 16:27:49 2006
@@ -21004,16 +21004,16 @@
 diff -NurpP --minimal linux-2.6.18/kernel/timer.c linux-2.6.18-vs2.1.1-rc35-t1/kernel/timer.c
 --- linux-2.6.18/kernel/timer.c	2006-09-20 16:58:44 +0200
 +++ linux-2.6.18-vs2.1.1-rc35-t1/kernel/timer.c	2006-09-25 15:40:02 +0200
-@@ -34,6 +34,9 @@
- #include <linux/syscalls.h>
- #include <linux/delay.h>
- #include <linux/freezer.h>
+@@ -31,6 +31,9 @@
+ #include <linux/time.h>
+ #include <linux/jiffies.h>
+ #include <linux/posix-timers.h>
 +#include <linux/vs_cvirt.h>
 +#include <linux/vs_pid.h>
 +#include <linux/vserver/sched.h>
- 
- #include <asm/uaccess.h>
- #include <asm/unistd.h>
+ #include <linux/cpu.h>
+ #include <linux/syscalls.h>
+ #include <linux/delay.h>
 @@ -1302,12 +1305,6 @@ asmlinkage unsigned long sys_alarm(unsig
  
  #endif
================================================================

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