Updated to 3.0.40

diff --git a/kernel-grsec_full.patch b/kernel-grsec_full.patch
index cfd7983feb14f7c0c1f399e7e163b1eb0d86a477..3af70536b234722352152474da3b7b25cd1830e7 100644 (file)
--- a/kernel-grsec_full.patch
+++ b/kernel-grsec_full.patch
@@ -42344,9 +42344,9 @@ diff -urNp linux-3.0.9/fs/fifo.c linux-3.0.9/fs/fifo.c
  
 -              if (!pipe->readers) {
 +              if (!atomic_read(&pipe->readers)) {
-                       wait_for_partner(inode, &pipe->r_counter);
-                       if (signal_pending(current))
+                       if (wait_for_partner(inode, &pipe->r_counter))
                                goto err_wr;
+               }
 @@ -105,11 +105,11 @@ static int fifo_open(struct inode *inode
         */
                filp->f_op = &rdwr_pipefifo_fops;
@@ -57912,18 +57912,6 @@ diff -urNp linux-3.0.9/include/linux/compiler.h linux-3.0.9/include/linux/compil
 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
  
  #endif /* __LINUX_COMPILER_H */
-diff -urNp linux-3.0.9/include/linux/cpuset.h linux-3.0.9/include/linux/cpuset.h
---- linux-3.0.9/include/linux/cpuset.h 2011-11-11 13:12:24.000000000 -0500
-+++ linux-3.0.9/include/linux/cpuset.h 2011-11-15 20:02:59.000000000 -0500
-@@ -118,7 +118,7 @@ static inline void put_mems_allowed(void
-        * nodemask.
-        */
-       smp_mb();
--      --ACCESS_ONCE(current->mems_allowed_change_disable);
-+      --ACCESS_ONCE_RW(current->mems_allowed_change_disable);
- }
- 
- static inline void set_mems_allowed(nodemask_t nodemask)
 diff -urNp linux-3.0.9/include/linux/crypto.h linux-3.0.9/include/linux/crypto.h
 --- linux-3.0.9/include/linux/crypto.h 2011-11-11 13:12:24.000000000 -0500
 +++ linux-3.0.9/include/linux/crypto.h 2011-11-15 20:02:59.000000000 -0500
@@ -71375,8 +71363,8 @@ diff -urNp linux-3.0.9/mm/vmstat.c linux-3.0.9/mm/vmstat.c
   *
   * vm_stat contains the global counters
   */
--atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
-+atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS];
+-atomic_long_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
++atomic_long_unchecked_t vm_stat[NR_VM_ZONE_STAT_ITEMS] __cacheline_aligned_in_smp;
  EXPORT_SYMBOL(vm_stat);
  
  #ifdef CONFIG_SMP

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index b4328d44473a74753556752a20501b96c78fb7a1..a4fe6a856568cc168406237192c5256ec3c90e08 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -8492,9 +8492,9 @@ diff -NurpP --minimal linux-3.0.25/include/linux/init_task.h linux-3.0.25-vs2.3.
 --- linux-3.0.25/include/linux/init_task.h     2011-07-22 11:18:10.000000000 +0200
 +++ linux-3.0.25-vs2.3.2.3/include/linux/init_task.h   2011-06-10 22:11:24.000000000 +0200
 @@ -193,6 +193,10 @@ extern struct cred init_cred;
-       INIT_FTRACE_GRAPH                                               \
        INIT_TRACE_RECURSION                                            \
        INIT_TASK_RCU_PREEMPT(tsk)                                      \
+       INIT_CPUSET_SEQ                                                 \
 +      .xid            = 0,                                            \
 +      .vx_info        = NULL,                                         \
 +      .nid            = 0,                                            \

diff --git a/kernel.spec b/kernel.spec
index f61a33217001171bd090f67237045f88f0b6edfb..7d8710e401b600d6559252538bf98e91571bfaee 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -93,7 +93,7 @@
 %endif
 
 %define                basever         3.0
-%define                postver         .36
+%define                postver         .40
 %define                rel             1
 
 %define                _enable_debug_packages                  0
@@ -140,7 +140,7 @@ Source0:    http://www.kernel.org/pub/linux/kernel/v3.x/linux-%{basever}.tar.xz
 # Source0-md5: ecf932280e2441bdd992423ef3d55f8f
 %if "%{postver}" != ".0"
 Patch0:                http://www.kernel.org/pub/linux/kernel/v3.x/patch-%{version}.bz2
-# Patch0-md5:  cd69f8476268f179d0aa46d93a90c63e
+# Patch0-md5:  218425fb6bff628735e0ae4863f91fde
 %endif
 
 Source3:       kernel-autoconf.h