kernel/3.1x: add split code for LZMA compressed kernel based firmwares

[oweals/openwrt.git] / target / linux / generic / patches-3.10 / 950-vm_exports.patch

diff --git a/target/linux/generic/patches-3.10/950-vm_exports.patch b/target/linux/generic/patches-3.10/950-vm_exports.patch
index c19c3320af04b75d0c9a4d431e065eb2ffe93c6c..faf58660e6568cdd3764205d1e3ae016f012459d 100644 (file)
--- a/target/linux/generic/patches-3.10/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.10/950-vm_exports.patch
@@ -1,7 +1,7 @@
 --- a/mm/shmem.c
 +++ b/mm/shmem.c
-@@ -2889,6 +2889,15 @@ static struct dentry_operations anon_ops
-       .d_dname = shmem_dname
+@@ -2883,6 +2883,15 @@ static struct dentry_operations anon_ops
+       .d_dname = simple_dname
  };
  
 +void shmem_set_file(struct vm_area_struct *vma, struct file *file)
@@ -16,7 +16,7 @@
  /**
   * shmem_file_setup - get an unlinked file living in tmpfs
   * @name: name for dentry (to be seen in /proc/<pid>/maps
-@@ -2962,11 +2971,8 @@ int shmem_zero_setup(struct vm_area_stru
+@@ -2956,11 +2965,8 @@ int shmem_zero_setup(struct vm_area_stru
        file = shmem_file_setup("dev/zero", size, vma->vm_flags);
        if (IS_ERR(file))
                return PTR_ERR(file);
@@ -52,7 +52,7 @@
   * When we die, we re-parent all our children, and try to:
 --- a/kernel/sched/core.c
 +++ b/kernel/sched/core.c
-@@ -3707,6 +3707,7 @@ int can_nice(const struct task_struct *p
+@@ -3719,6 +3719,7 @@ int can_nice(const struct task_struct *p
        return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
                capable(CAP_SYS_NICE));
  }