aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/950-vm_exports.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2014-11-10 22:51:30 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2014-11-10 22:51:30 +0000
commita69ebe234d46ca95cbcbcba7f4ef9bae598eb95b (patch)
treef5a849fbbd0c2bb9bc9ba75b80f9ff679a707b09 /target/linux/generic/patches-3.18/950-vm_exports.patch
parentc5b5e68879238d195e7a797ca82c8e0043e797ee (diff)
downloadupstream-a69ebe234d46ca95cbcbcba7f4ef9bae598eb95b.tar.gz
upstream-a69ebe234d46ca95cbcbcba7f4ef9bae598eb95b.tar.bz2
upstream-a69ebe234d46ca95cbcbcba7f4ef9bae598eb95b.zip
kernel: update kernel 3.18 to rc4
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> SVN-Revision: 43229
Diffstat (limited to 'target/linux/generic/patches-3.18/950-vm_exports.patch')
-rw-r--r--target/linux/generic/patches-3.18/950-vm_exports.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/950-vm_exports.patch b/target/linux/generic/patches-3.18/950-vm_exports.patch
index d8dc186fb0..0291957bf0 100644
--- a/target/linux/generic/patches-3.18/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.18/950-vm_exports.patch
@@ -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
-@@ -3147,6 +3147,7 @@ int can_nice(const struct task_struct *p
+@@ -3188,6 +3188,7 @@ int can_nice(const struct task_struct *p
return (nice_rlim <= task_rlimit(p, RLIMIT_NICE) ||
capable(CAP_SYS_NICE));
}
@@ -62,7 +62,7 @@
--- a/mm/memory.c
+++ b/mm/memory.c
-@@ -1403,6 +1403,7 @@ void zap_page_range(struct vm_area_struc
+@@ -1404,6 +1404,7 @@ void zap_page_range(struct vm_area_struc
mmu_notifier_invalidate_range_end(mm, start, end);
tlb_finish_mmu(&tlb, start, end);
}