- adapted to current LINUX_2_6

Changed files:
    linux-2.6-vs.patch -> 1.2

diff --git a/linux-2.6-vs.patch b/linux-2.6-vs.patch
index 9efa5634cb0836992901d4605fd96e3b3dd6b693..99ccfe8a3fdfbbbdeb2c3a6915c7594bd28de1ae 100644 (file)
--- a/linux-2.6-vs.patch
+++ b/linux-2.6-vs.patch
@@ -5878,20 +5878,19 @@ diff -NurpP --minimal linux-2.6.10/include/linux/fs.h linux-2.6.10-vs1.9.3.17/in
        unsigned long           f_version;
        void                    *f_security;
  
-diff -NurpP --minimal linux-2.6.10/include/linux/init_task.h linux-2.6.10-vs1.9.3.17/include/linux/init_task.h
---- linux-2.6.10/include/linux/init_task.h     2004-12-25 01:55:29.000000000 +0100
-+++ linux-2.6.10-vs1.9.3.17/include/linux/init_task.h  2004-12-26 19:40:23.000000000 +0100
-@@ -112,6 +112,10 @@ extern struct group_info init_groups;
-       .proc_lock      = SPIN_LOCK_UNLOCKED,                           \
-       .switch_lock    = SPIN_LOCK_UNLOCKED,                           \
+--- linux-2.6.10/include/linux/init_task.h.orig        2005-01-06 11:59:13.000000000 +0100
++++ linux-2.6.10/include/linux/init_task.h     2005-01-06 12:06:32.000000000 +0100
+@@ -114,6 +114,10 @@
        .journal_info   = NULL,                                         \
+       .private_pages  = LIST_HEAD_INIT(tsk.private_pages),            \
+       .private_pages_count = 0,                                       \
 +      .xid            = 0,                                            \
 +      .vx_info        = NULL,                                         \
 +      .nid            = 0,                                            \
 +      .nx_info        = NULL,                                         \
  }
  
- 
+ #endif
 diff -NurpP --minimal linux-2.6.10/include/linux/ip.h linux-2.6.10-vs1.9.3.17/include/linux/ip.h
 --- linux-2.6.10/include/linux/ip.h    2004-08-14 12:55:09.000000000 +0200
 +++ linux-2.6.10-vs1.9.3.17/include/linux/ip.h 2004-12-26 19:40:29.000000000 +0100
@@ -6214,14 +6213,13 @@ diff -NurpP --minimal linux-2.6.10/include/linux/sunrpc/clnt.h linux-2.6.10-vs1.
  
        struct rpc_rtt *        cl_rtt;         /* RTO estimator data */
        struct rpc_portmap *    cl_pmap;        /* port mapping */
-diff -NurpP --minimal linux-2.6.10/include/linux/sysctl.h linux-2.6.10-vs1.9.3.17/include/linux/sysctl.h
---- linux-2.6.10/include/linux/sysctl.h        2004-12-25 01:55:30.000000000 +0100
-+++ linux-2.6.10-vs1.9.3.17/include/linux/sysctl.h     2004-12-26 19:40:34.000000000 +0100
-@@ -134,6 +134,7 @@ enum
-       KERN_SPARC_SCONS_PWROFF=64, /* int: serial console power-off halt */
+--- linux-2.6.10/include/linux/sysctl.h.orig   2005-01-06 11:59:10.000000000 +0100
++++ linux-2.6.10/include/linux/sysctl.h        2005-01-06 12:05:55.000000000 +0100
+@@ -135,6 +135,7 @@
        KERN_HZ_TIMER=65,       /* int: hz timer on or off */
        KERN_UNKNOWN_NMI_PANIC=66, /* int: unknown nmi panic flag */
-+      KERN_VSHELPER=67,       /* string: path to vshelper policy agent */
+       KERN_FBSPLASH=67,       /* string: path to fbsplash helper */
++      KERN_VSHELPER=68,       /* string: path to vshelper policy agent */
  };