SOURCES (LINUX_2_6): linux-2.6-vs2.1.patch - adjusted one chunk fo...

[hawk]

Author: hawk                         Date: Mon Aug  7 11:24:02 2006 GMT
Module: SOURCES                       Tag: LINUX_2_6
---- Log message:
- adjusted one chunk for kernel/timer.c to apply cleanly

---- Files affected:
SOURCES:
   linux-2.6-vs2.1.patch (1.1.2.29 -> 1.1.2.30) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.1.patch
diff -u SOURCES/linux-2.6-vs2.1.patch:1.1.2.29 SOURCES/linux-2.6-vs2.1.patch:1.1.2.30
--- SOURCES/linux-2.6-vs2.1.patch:1.1.2.29	Mon Aug  7 13:16:49 2006
+++ SOURCES/linux-2.6-vs2.1.patch	Mon Aug  7 13:23:55 2006
@@ -20720,10 +20720,11 @@
 diff -NurpP --minimal linux-2.6.17.7/kernel/timer.c linux-2.6.17.7-vs2.1.1-rc28/kernel/timer.c
 --- linux-2.6.17.7/kernel/timer.c	2006-06-18 04:55:34 +0200
 +++ linux-2.6.17.7-vs2.1.1-rc28/kernel/timer.c	2006-07-09 17:07:14 +0200
-@@ -34,6 +34,9 @@
+@@ -34,7 +34,10 @@
  #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>
================================================================

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