summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.9/950-vm_exports.patch
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-04-15 16:10:01 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-04-15 16:10:01 +0000
commit91718a50f4e50bbd57e64bc36c148d2731b51670 (patch)
tree3d1220b453e500f5ed23a83b9ec3cdba2223d951 /target/linux/generic/patches-3.9/950-vm_exports.patch
parentc40bdc5e6f1d367a889366d3d4d3147f9ce04e8c (diff)
[generic/3.9]: refresh against -rc7
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36340 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.9/950-vm_exports.patch')
-rw-r--r--target/linux/generic/patches-3.9/950-vm_exports.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.9/950-vm_exports.patch b/target/linux/generic/patches-3.9/950-vm_exports.patch
index 443218469..ab1e0a685 100644
--- a/target/linux/generic/patches-3.9/950-vm_exports.patch
+++ b/target/linux/generic/patches-3.9/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
-@@ -3671,6 +3671,7 @@ int can_nice(const struct task_struct *p
+@@ -3673,6 +3673,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
-@@ -1412,6 +1412,7 @@ void zap_page_range(struct vm_area_struc
+@@ -1413,6 +1413,7 @@ void zap_page_range(struct vm_area_struc
mmu_notifier_invalidate_range_end(mm, start, end);
tlb_finish_mmu(&tlb, start, end);
}