diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-11-29 10:30:58 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-11-29 10:30:58 +0000 |
| commit | 15a48a38b8ea48596667ef340a7d263fe74fbaa0 (patch) | |
| tree | b7feb2c8ab6c41b9e49a14d5202072ae11f53e49 /target/linux/generic/patches-3.14/950-vm_exports.patch | |
| parent | 5685e23f48e1f2c4ce44b3328a431b79bab85e41 (diff) | |
| download | upstream-15a48a38b8ea48596667ef340a7d263fe74fbaa0.tar.gz upstream-15a48a38b8ea48596667ef340a7d263fe74fbaa0.tar.bz2 upstream-15a48a38b8ea48596667ef340a7d263fe74fbaa0.zip | |
kernel: update 3.14 to 3.14.25
Signed-off-by: Luka Perkov <luka@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43427 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.14/950-vm_exports.patch')
| -rw-r--r-- | target/linux/generic/patches-3.14/950-vm_exports.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.14/950-vm_exports.patch b/target/linux/generic/patches-3.14/950-vm_exports.patch index 6d8bc58c3d..344a887eff 100644 --- a/target/linux/generic/patches-3.14/950-vm_exports.patch +++ b/target/linux/generic/patches-3.14/950-vm_exports.patch @@ -1,6 +1,6 @@ --- a/mm/shmem.c +++ b/mm/shmem.c -@@ -3043,6 +3043,15 @@ put_memory: +@@ -2985,6 +2985,15 @@ put_memory: return res; } @@ -16,7 +16,7 @@ /** * shmem_kernel_file_setup - get an unlinked file living in tmpfs which must be * kernel internal. There will be NO LSM permission checks against the -@@ -3082,11 +3091,8 @@ int shmem_zero_setup(struct vm_area_stru +@@ -3024,11 +3033,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 -@@ -3052,6 +3052,7 @@ int can_nice(const struct task_struct *p +@@ -3056,6 +3056,7 @@ int can_nice(const struct task_struct *p return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) || capable(CAP_SYS_NICE)); } |