SOURCES (hawk-LINUX_2_6): linux-2.6-vs2.3.patch - reverted fs/jffs...

[hawk]

Author: hawk                         Date: Mon Mar 26 16:45:19 2007 GMT
Module: SOURCES                       Tag: hawk-LINUX_2_6
---- Log message:
- reverted fs/jffs2/ioctl.c and kernel/timer.c fixes

---- Files affected:
SOURCES:
   linux-2.6-vs2.3.patch (1.1.2.5 -> 1.1.2.6) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-vs2.3.patch
diff -u SOURCES/linux-2.6-vs2.3.patch:1.1.2.5 SOURCES/linux-2.6-vs2.3.patch:1.1.2.6
--- SOURCES/linux-2.6-vs2.3.patch:1.1.2.5	Mon Mar 26 18:24:41 2007
+++ SOURCES/linux-2.6-vs2.3.patch	Mon Mar 26 18:45:13 2007
@@ -6610,11 +6610,10 @@
 diff -NurpP --minimal linux-2.6.20.1/fs/jffs2/ioctl.c linux-2.6.20.1-vs2.3.0.11/fs/jffs2/ioctl.c
 --- linux-2.6.20.1/fs/jffs2/ioctl.c	2006-01-03 17:29:56 +0100
 +++ linux-2.6.20.1-vs2.3.0.11/fs/jffs2/ioctl.c	2007-02-26 21:23:32 +0100
-@@ -12,12 +12,68 @@
+@@ -12,12 +12,67 @@
   */
  
  #include <linux/fs.h>
-+#include <linux/sched.h>
 +#include <linux/types.h>
 +#include <linux/mount.h>
 +#include <linux/jffs2.h>
@@ -22066,9 +22065,9 @@
 --- linux-2.6.20.1/kernel/timer.c	2007-02-06 03:01:56 +0100
 +++ linux-2.6.20.1-vs2.3.0.11/kernel/timer.c	2007-02-06 03:05:22 +0100
 @@ -34,6 +34,10 @@
+ #include <linux/cpu.h>
  #include <linux/syscalls.h>
  #include <linux/delay.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.3.patch?r1=1.1.2.5&r2=1.1.2.6&f=u